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

lib: sbi: Fix mhpmeventh access for rv32 in absence of sscofpmf

Browse Source 
MHPMEVENT3H-31H are defined in sscofpmf extension. Thus, they should be
accessed only if sscofpmf is present.

Signed-off-by: Atish Patra <atishp@rivosinc.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
Atish Patra
2022-04-28 11:48:29 -07:00
committed by Anup Patel
parent e576b3e620
commit b0c9df514b
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/sbi/riscv_asm.c
View File

@@ -139,6 +139,10 @@ unsigned long csr_read_num(int csr_num)
switchcase_csr_read_4(CSR_MHPMCOUNTER4H, ret) switchcase_csr_read_4(CSR_MHPMCOUNTER4H, ret)
switchcase_csr_read_8(CSR_MHPMCOUNTER8H, ret) switchcase_csr_read_8(CSR_MHPMCOUNTER8H, ret)
switchcase_csr_read_16(CSR_MHPMCOUNTER16H, ret) switchcase_csr_read_16(CSR_MHPMCOUNTER16H, ret)
/**
* The CSR range MHPMEVENT[3-16]H are available only if sscofpmf
* extension is present. The caller must ensure that.
*/
switchcase_csr_read(CSR_MHPMEVENT3H, ret) switchcase_csr_read(CSR_MHPMEVENT3H, ret)
switchcase_csr_read_4(CSR_MHPMEVENT4H, ret) switchcase_csr_read_4(CSR_MHPMEVENT4H, ret)
switchcase_csr_read_8(CSR_MHPMEVENT8H, ret) switchcase_csr_read_8(CSR_MHPMEVENT8H, ret)

8
lib/sbi/sbi_pmu.c
View File

@@ -404,7 +404,9 @@ static int pmu_reset_hw_mhpmevent(int ctr_idx)
return SBI_EFAIL; return SBI_EFAIL;
#if __riscv_xlen == 32 #if __riscv_xlen == 32
csr_write_num(CSR_MHPMEVENT3 + ctr_idx - 3, 0); csr_write_num(CSR_MHPMEVENT3 + ctr_idx - 3, 0);
csr_write_num(CSR_MHPMEVENT3H + ctr_idx - 3, 0); if (sbi_hart_has_feature(sbi_scratch_thishart_ptr(),
SBI_HART_HAS_SSCOFPMF))
csr_write_num(CSR_MHPMEVENT3H + ctr_idx - 3, 0);
#else #else
csr_write_num(CSR_MHPMEVENT3 + ctr_idx - 3, 0); csr_write_num(CSR_MHPMEVENT3 + ctr_idx - 3, 0);
#endif #endif
@@ -483,7 +485,9 @@ static int pmu_update_hw_mhpmevent(struct sbi_pmu_hw_event *hw_evt, int ctr_idx,
#if __riscv_xlen == 32 #if __riscv_xlen == 32
csr_write_num(CSR_MHPMEVENT3 + ctr_idx - 3, mhpmevent_val & 0xFFFFFFFF); csr_write_num(CSR_MHPMEVENT3 + ctr_idx - 3, mhpmevent_val & 0xFFFFFFFF);
csr_write_num(CSR_MHPMEVENT3H + ctr_idx - 3, mhpmevent_val >> BITS_PER_LONG); if (sbi_hart_has_feature(scratch, SBI_HART_HAS_SSCOFPMF))
csr_write_num(CSR_MHPMEVENT3H + ctr_idx - 3,
mhpmevent_val >> BITS_PER_LONG);
#else #else
csr_write_num(CSR_MHPMEVENT3 + ctr_idx - 3, mhpmevent_val); csr_write_num(CSR_MHPMEVENT3 + ctr_idx - 3, mhpmevent_val);
#endif #endif