lib: sbi: Fix sbi_pmu_exit() for systems not having MCOUNTINHIBIT csr
authorAnup Patel <anup.patel@wdc.com>
Sun, 11 Jul 2021 08:58:19 +0000 (14:28 +0530)
committerAnup Patel <anup@brainfault.org>
Sun, 11 Jul 2021 09:01:21 +0000 (14:31 +0530)
The sbi_pmu_exit() crashes on systems not having MCOUNTINHIBIT csr
so to fix this we check SBI_HART_HAS_MCOUNTINHIBIT feature in
sbi_pmu_exit() and do nothing if it is not available.

Fixes: 13d40f21d588 ("lib: sbi: Add PMU support")
Signed-off-by: Anup Patel <anup.patel@wdc.com>
lib/sbi/sbi_pmu.c

index 4092e6f..c276a46 100644 (file)
@@ -583,6 +583,10 @@ void sbi_pmu_exit(struct sbi_scratch *scratch)
 {
        u32 hartid = current_hartid();
 
+       /* SBI PMU is not supported if mcountinhibit is not available */
+       if (!sbi_hart_has_feature(scratch, SBI_HART_HAS_MCOUNTINHIBIT))
+               return;
+
        csr_write(CSR_MCOUNTINHIBIT, 0xFFFFFFF8);
        csr_write(CSR_MCOUNTEREN, 7);
        pmu_reset_event_map(hartid);