lib: pmu: check SSCOF before masking
authorNikita Shubin <n.shubin@yadro.com>
Wed, 8 Dec 2021 11:16:54 +0000 (14:16 +0300)
committerAnup Patel <anup@brainfault.org>
Sat, 11 Dec 2021 10:56:15 +0000 (16:26 +0530)
We should check if SSCOF extension is present,
before applying inhibit mask and clearing overflow,
otherwise undesirable value can be written
in MHPMEVENT_N CSR.

Signed-off-by: Nikita Shubin <n.shubin@yadro.com>
Reviewed-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Xiang W <wxjstz@126.com>
lib/sbi/sbi_pmu.c

index 10668a3..5b845f8 100644 (file)
@@ -467,7 +467,8 @@ static int pmu_update_hw_mhpmevent(struct sbi_pmu_hw_event *hw_evt, int ctr_idx,
                return SBI_EFAIL;
 
        /* Always clear the OVF bit and inhibit countin of events in M-mode */
-       mhpmevent_val = (mhpmevent_val & ~MHPMEVENT_SSCOF_MASK) | MHPMEVENT_MINH;
+       if (sbi_hart_has_feature(scratch, SBI_HART_HAS_SSCOFPMF))
+               mhpmevent_val = (mhpmevent_val & ~MHPMEVENT_SSCOF_MASK) | MHPMEVENT_MINH;
 
        /* Update the inhibit flags based on inhibit flags received from supervisor */
        pmu_update_inhibit_flags(flags, &mhpmevent_val);