Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

lib: sbi: Using one array to define the name of extensions

Browse Source 
Define an array sbi_hart_ext to map extension ID and name , and use it
for ISA parsing and printing out the supported extensions.

Signed-off-by: Yong-Xuan Wang <yongxuan.wang@sifive.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
Yong-Xuan Wang
2023-12-12 08:58:34 +00:00
committed by Anup Patel
parent 056fe6f85d
commit 776770d2ad
3 changed files with 31 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/sbi/sbi_hart.h
View File

@@ -52,6 +52,13 @@ enum sbi_hart_extensions {
SBI_HART_EXT_MAX, SBI_HART_EXT_MAX,
}; };
struct sbi_hart_ext_data {
const unsigned int id;
const char *name;
};
extern const struct sbi_hart_ext_data sbi_hart_ext[];
/* /*
* Smepmp enforces access boundaries between M-mode and * Smepmp enforces access boundaries between M-mode and
* S/U-mode. When it is enabled, the PMPs are programmed * S/U-mode. When it is enabled, the PMPs are programmed

62
lib/sbi/sbi_hart.c
View File

@@ -660,47 +660,23 @@ bool sbi_hart_has_extension(struct sbi_scratch *scratch,
return false; return false;
} }
static inline char *sbi_hart_extension_id2string(int ext) #define __SBI_HART_EXT_DATA(_name, _id) { \
{ .name = #_name, \
char *estr = NULL; .id = _id, \
switch (ext) {
case SBI_HART_EXT_SMAIA:
estr = "smaia";
break;
case SBI_HART_EXT_SMSTATEEN:
estr = "smstateen";
break;
case SBI_HART_EXT_SSCOFPMF:
estr = "sscofpmf";
break;
case SBI_HART_EXT_SSTC:
estr = "sstc";
break;
case SBI_HART_EXT_ZICNTR:
estr = "zicntr";
break;
case SBI_HART_EXT_ZIHPM:
estr = "zihpm";
break;
case SBI_HART_EXT_ZKR:
estr = "zkr";
break;
case SBI_HART_EXT_SMEPMP:
estr = "smepmp";
break;
case SBI_HART_EXT_SMCNTRPMF:
estr = "smcntrpmf";
break;
case SBI_HART_EXT_XANDESPMU:
estr = "xandespmu";
break;
default:
break;
} }
return estr; const struct sbi_hart_ext_data sbi_hart_ext[] = {
} __SBI_HART_EXT_DATA(smaia, SBI_HART_EXT_SMAIA),
__SBI_HART_EXT_DATA(smepmp, SBI_HART_EXT_SMEPMP),
__SBI_HART_EXT_DATA(smstateen, SBI_HART_EXT_SMSTATEEN),
__SBI_HART_EXT_DATA(sscofpmf, SBI_HART_EXT_SSCOFPMF),
__SBI_HART_EXT_DATA(sstc, SBI_HART_EXT_SSTC),
__SBI_HART_EXT_DATA(zicntr, SBI_HART_EXT_ZICNTR),
__SBI_HART_EXT_DATA(zihpm, SBI_HART_EXT_ZIHPM),
__SBI_HART_EXT_DATA(zkr, SBI_HART_EXT_ZKR),
__SBI_HART_EXT_DATA(smcntrpmf, SBI_HART_EXT_SMCNTRPMF),
__SBI_HART_EXT_DATA(xandespmu, SBI_HART_EXT_XANDESPMU),
};
/** /**
* Get the hart extensions in string format * Get the hart extensions in string format
@@ -717,20 +693,16 @@ void sbi_hart_get_extensions_str(struct sbi_scratch *scratch,
struct sbi_hart_features *hfeatures = struct sbi_hart_features *hfeatures =
sbi_scratch_offset_ptr(scratch, hart_features_offset); sbi_scratch_offset_ptr(scratch, hart_features_offset);
int offset = 0, ext = 0; int offset = 0, ext = 0;
char *temp;
if (!extensions_str || nestr <= 0) if (!extensions_str || nestr <= 0)
return; return;
sbi_memset(extensions_str, 0, nestr); sbi_memset(extensions_str, 0, nestr);
for_each_set_bit(ext, hfeatures->extensions, SBI_HART_EXT_MAX) { for_each_set_bit(ext, hfeatures->extensions, SBI_HART_EXT_MAX) {
temp = sbi_hart_extension_id2string(ext);
if (temp) {
sbi_snprintf(extensions_str + offset, sbi_snprintf(extensions_str + offset,
nestr - offset, nestr - offset,
"%s,", temp); "%s,", sbi_hart_ext[ext].name);
offset = offset + sbi_strlen(temp) + 1; offset = offset + sbi_strlen(sbi_hart_ext[ext].name) + 1;
}
} }
if (offset) if (offset)

6
lib/utils/fdt/fdt_helper.c
View File

@@ -401,8 +401,10 @@ static int fdt_parse_isa_one_hart(const char *isa, unsigned long *extensions)
continue; \ continue; \
} }
set_multi_letter_ext("smepmp", SBI_HART_EXT_SMEPMP); for (j = 0; j < SBI_HART_EXT_MAX; j++) {
set_multi_letter_ext("zkr", SBI_HART_EXT_ZKR); set_multi_letter_ext(sbi_hart_ext[j].name,
sbi_hart_ext[j].id);
}
#undef set_multi_letter_ext #undef set_multi_letter_ext
} }