Mirrors/opensbi
1
0
Fork 1
mirror of https://github.com/riscv-software-src/opensbi.git synced 2025-08-24 15:31:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

lib: sbi: Improve misa_string() implementation

Browse Source 
The RISC-V ISA string does not follow alphabetical order. Instead,
we have a RISC-V specific ordering of extensions in the RISC-V ISA
string. This patch improves misa_string() implementation to return
a valid RISC-V ISA string.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
This commit is contained in:
Anup Patel
2020-05-05 11:46:25 +05:30
committed by Anup Patel
parent 5338679ff0
commit dc38929dfb
3 changed files with 52 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/sbi/riscv_asm.h
View File

@@ -173,19 +173,8 @@ int misa_extension_imp(char ext);
/* Get MXL field of misa, return -1 on error */ /* Get MXL field of misa, return -1 on error */
int misa_xlen(void); int misa_xlen(void);
static inline void misa_string(char *out, unsigned int out_sz) /* Get RISC-V ISA string representation */
{ void misa_string(int xlen, char *out, unsigned int out_sz);
unsigned long i;
for (i = 0; i < 26; i++) {
if (misa_extension_imp('A' + i)) {
*out = 'A' + i;
out++;
}
}
*out = '\0';
out++;
}
int pmp_set(unsigned int n, unsigned long prot, unsigned long addr, int pmp_set(unsigned int n, unsigned long prot, unsigned long addr,
unsigned long log2len); unsigned long log2len);

48
lib/sbi/riscv_asm.c
View File

@@ -17,8 +17,13 @@ int misa_extension_imp(char ext)
{ {
unsigned long misa = csr_read(CSR_MISA); unsigned long misa = csr_read(CSR_MISA);
if (misa) if (misa) {
return misa & (1 << (ext - 'A')); if ('A' <= ext && ext <= 'Z')
return misa & (1 << (ext - 'A'));
if ('a' <= ext && ext <= 'z')
return misa & (1 << (ext - 'a'));
return 0;
}
return sbi_platform_misa_extension(sbi_platform_thishart_ptr(), ext); return sbi_platform_misa_extension(sbi_platform_thishart_ptr(), ext);
} }
@@ -44,6 +49,45 @@ int misa_xlen(void)
return r ? r : -1; return r ? r : -1;
} }
void misa_string(int xlen, char *out, unsigned int out_sz)
{
unsigned int i, pos = 0;
const char valid_isa_order[] = "iemafdqclbjtpvnsuhkorwxyzg";
if (!out)
return;
if (5 <= (out_sz - pos)) {
out[pos++] = 'r';
out[pos++] = 'v';
switch (xlen) {
case 1:
out[pos++] = '3';
out[pos++] = '2';
break;
case 2:
out[pos++] = '6';
out[pos++] = '4';
break;
case 3:
out[pos++] = '1';
out[pos++] = '2';
out[pos++] = '8';
break;
default:
return;
}
}
for (i = 0; i < array_size(valid_isa_order) && (pos < out_sz); i++) {
if (misa_extension_imp(valid_isa_order[i]))
out[pos++] = valid_isa_order[i];
}
if (pos < out_sz)
out[pos++] = '\0';
}
unsigned long csr_read_num(int csr_num) unsigned long csr_read_num(int csr_num)
{ {
unsigned long ret = 0; unsigned long ret = 0;

8
lib/sbi/sbi_init.c
View File

@@ -53,15 +53,15 @@ static void sbi_boot_prints(struct sbi_scratch *scratch, u32 hartid)
sbi_printf("Error %d getting MISA XLEN\n", xlen); sbi_printf("Error %d getting MISA XLEN\n", xlen);
sbi_hart_hang(); sbi_hart_hang();
} }
xlen = 16 * (1 << xlen); misa_string(xlen, str, sizeof(str));
misa_string(str, sizeof(str));
/* Platform details */ /* Platform details */
sbi_printf("Platform Name : %s\n", sbi_platform_name(plat)); sbi_printf("Platform Name : %s\n", sbi_platform_name(plat));
sbi_printf("Platform HART Features : RV%d%s\n", xlen, str);
sbi_printf("Platform HART Count : %u\n", sbi_printf("Platform HART Count : %u\n",
sbi_platform_hart_count(plat)); sbi_platform_hart_count(plat));
sbi_printf("Current HART ID : %u\n", hartid); /* Boot HART details */
sbi_printf("Boot HART ID : %u\n", hartid);
sbi_printf("Boot HART ISA : %s\n", str);
/* Firmware details */ /* Firmware details */
sbi_printf("Firmware Base : 0x%lx\n", scratch->fw_start); sbi_printf("Firmware Base : 0x%lx\n", scratch->fw_start);
sbi_printf("Firmware Size : %d KB\n", sbi_printf("Firmware Size : %d KB\n",