lib: sbi: Fix mstatus_init() for RV32 when Sscofpmf is not available
authorAnup Patel <apatel@ventanamicro.com>
Thu, 28 Apr 2022 07:43:59 +0000 (13:13 +0530)
committerAnup Patel <anup@brainfault.org>
Thu, 28 Apr 2022 14:09:01 +0000 (19:39 +0530)
The mhpmevent3h to mhpmevent31h CSRs are available on RV32 only when
Sscofpmf extension is available so mstatus_init() should set this
CSRs only when Sscofpmf extension is available.

Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Reviewed-by: Atish Patra <atishp@rivosinc.com>
lib/sbi/sbi_hart.c

index a50b6e4..229c14a 100644 (file)
@@ -82,7 +82,9 @@ static void mstatus_init(struct sbi_scratch *scratch)
        for (cidx = 0; cidx < num_mhpm; cidx++) {
 #if __riscv_xlen == 32
                csr_write_num(CSR_MHPMEVENT3 + cidx, mhpmevent_init_val & 0xFFFFFFFF);
-               csr_write_num(CSR_MHPMEVENT3H + cidx, mhpmevent_init_val >> BITS_PER_LONG);
+               if (sbi_hart_has_feature(scratch, SBI_HART_HAS_SSCOFPMF))
+                       csr_write_num(CSR_MHPMEVENT3H + cidx,
+                                     mhpmevent_init_val >> BITS_PER_LONG);
 #else
                csr_write_num(CSR_MHPMEVENT3 + cidx, mhpmevent_init_val);
 #endif