lib: sbi: Do not clear active_events for cycle/instret when stopping

Those events are enabled by default and should not be reset afterwards
since when using SBI_PMU_CFG_FLAG_SKIP_MATCH, it leads to unaccessible
counters after the first use.

Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com>
Reviewed-by: Atish Patra <atishp@rivosinc.com>

diff --git a/lib/sbi/sbi_pmu.c b/lib/sbi/sbi_pmu.c
index 04259aeb24ebae94caba1c03c851bc70c427b77d..f28c9f5e80a0d076dfdd8c59739ac65104ea2479 100644 (file)
--- a/lib/sbi/sbi_pmu.c
+++ b/lib/sbi/sbi_pmu.c
@@ -532,7 +532,7 @@ int sbi_pmu_ctr_stop(unsigned long cbase, unsigned long cmask,
                else
                        ret = pmu_ctr_stop_hw(cidx);
 
-               if (flag & SBI_PMU_STOP_FLAG_RESET) {
+               if (cidx > (CSR_INSTRET - CSR_CYCLE) && flag & SBI_PMU_STOP_FLAG_RESET) {
                        active_events[hartid][cidx] = SBI_PMU_EVENT_IDX_INVALID;
                        pmu_reset_hw_mhpmevent(cidx);
                }