diff options
Diffstat (limited to 'lib/sbi/sbi_hart.c')
| -rw-r--r-- | lib/sbi/sbi_hart.c | 49 |
1 files changed, 15 insertions, 34 deletions
diff --git a/lib/sbi/sbi_hart.c b/lib/sbi/sbi_hart.c index 80699fe..46cd55d 100644 --- a/lib/sbi/sbi_hart.c +++ b/lib/sbi/sbi_hart.c @@ -112,47 +112,25 @@ static void mstatus_init(struct sbi_scratch *scratch) menvcfg_val |= ((uint64_t)csr_read(CSR_MENVCFGH)) << 32; #endif - /* - * Set menvcfg.CBZE == 1 - * - * If Zicboz extension is not available then writes to - * menvcfg.CBZE will be ignored because it is a WARL field. - */ - menvcfg_val |= ENVCFG_CBZE; - - /* - * Set menvcfg.CBCFE == 1 - * - * If Zicbom extension is not available then writes to - * menvcfg.CBCFE will be ignored because it is a WARL field. - */ - menvcfg_val |= ENVCFG_CBCFE; +#define __set_menvcfg_ext(__ext, __bits) \ + if (sbi_hart_has_extension(scratch, __ext)) \ + menvcfg_val |= __bits; /* - * Set menvcfg.CBIE == 3 - * - * If Zicbom extension is not available then writes to - * menvcfg.CBIE will be ignored because it is a WARL field. + * Enable access to extensions if they are present in the + * hardware or in the device tree. */ - menvcfg_val |= ENVCFG_CBIE_INV << ENVCFG_CBIE_SHIFT; - /* - * Set menvcfg.PBMTE == 1 for RV64 or RV128 - * - * If Svpbmt extension is not available then menvcfg.PBMTE - * will be read-only zero. - */ + __set_menvcfg_ext(SBI_HART_EXT_ZICBOZ, ENVCFG_CBZE) + __set_menvcfg_ext(SBI_HART_EXT_ZICBOM, ENVCFG_CBCFE) + __set_menvcfg_ext(SBI_HART_EXT_ZICBOM, + ENVCFG_CBIE_INV << ENVCFG_CBIE_SHIFT) #if __riscv_xlen > 32 - menvcfg_val |= ENVCFG_PBMTE; + __set_menvcfg_ext(SBI_HART_EXT_SVPBMT, ENVCFG_PBMTE) #endif + __set_menvcfg_ext(SBI_HART_EXT_SSTC, ENVCFG_STCE) - /* - * The spec doesn't explicitly describe the reset value of menvcfg. - * Enable access to stimecmp if sstc extension is present in the - * hardware. - */ - if (sbi_hart_has_extension(scratch, SBI_HART_EXT_SSTC)) - menvcfg_val |= ENVCFG_STCE; +#undef __set_menvcfg_ext csr_write(CSR_MENVCFG, menvcfg_val); #if __riscv_xlen == 32 @@ -676,6 +654,9 @@ const struct sbi_hart_ext_data sbi_hart_ext[] = { __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), + __SBI_HART_EXT_DATA(zicboz, SBI_HART_EXT_ZICBOZ), + __SBI_HART_EXT_DATA(zicbom, SBI_HART_EXT_ZICBOM), + __SBI_HART_EXT_DATA(svpbmt, SBI_HART_EXT_SVPBMT), }; /** |