lib: sbi: Add Zkr in hart extensions

- Add Zkr as extension in sbi_hart_extensions enum
- Return "zkr" string for Zkr extension from sbi_hart_extension_id2string

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Anup Patel <anup@brainfault.org>

diff --git a/include/sbi/sbi_hart.h b/include/sbi/sbi_hart.h
index e60f41502f61757a80f243fc1bb922266a2d8bd0..fe1124ab2d952b2d128ca5b74a1e47edf7667c8f 100644 (file)
--- a/include/sbi/sbi_hart.h
+++ b/include/sbi/sbi_hart.h
@@ -40,6 +40,8 @@ enum sbi_hart_extensions {
        SBI_HART_EXT_ZICNTR,
        /** HART has Zihpm extension */
        SBI_HART_EXT_ZIHPM,
+       /** HART has Zkr extension */
+       SBI_HART_EXT_ZKR,
        /** Hart has Smcntrpmf extension */
        SBI_HART_EXT_SMCNTRPMF,
 

diff --git a/lib/sbi/sbi_hart.c b/lib/sbi/sbi_hart.c
index 29d648127deb602c8f61ba1aaad2e8a13f0ebddc..569596f182fc1dce41b94352c2c0151febcfbea4 100644 (file)
--- a/lib/sbi/sbi_hart.c
+++ b/lib/sbi/sbi_hart.c
@@ -678,6 +678,9 @@ static inline char *sbi_hart_extension_id2string(int ext)
        case SBI_HART_EXT_ZIHPM:
                estr = "zihpm";
                break;
+       case SBI_HART_EXT_ZKR:
+               estr = "zkr";
+               break;
        case SBI_HART_EXT_SMEPMP:
                estr = "smepmp";
                break;

diff --git a/lib/utils/fdt/fdt_helper.c b/lib/utils/fdt/fdt_helper.c
index 9ae7f09fb3b6a225d434410b6ed4335d3683eb2d..35be7baba444eba531fb7103e0cddfa93deb6aef 100644 (file)
--- a/lib/utils/fdt/fdt_helper.c
+++ b/lib/utils/fdt/fdt_helper.c
@@ -376,6 +376,7 @@ static int fdt_parse_isa_one_hart(const char *isa, unsigned long *extensions)
                        }
 
                set_multi_letter_ext("smepmp", SBI_HART_EXT_SMEPMP);
+               set_multi_letter_ext("zkr", SBI_HART_EXT_ZKR);
 #undef set_multi_letter_ext
        }