The test for number of events is not a substitute for properly
checking the feature register. Fix the define and skip if PMUv3 is not
available on the system. This includes emulator such as QEMU which
don't implement PMU counters as a matter of policy.
Signed-off-by: Alex Bennée <alex.bennee@xxxxxxxxxx>
Cc: Anders Roxell <anders.roxell@xxxxxxxxxx>
---
arm/pmu.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/arm/pmu.c b/arm/pmu.c
index 9ff7a301..66163a40 100644
--- a/arm/pmu.c
+++ b/arm/pmu.c
@@ -200,7 +200,7 @@ static void test_overflow_interrupt(bool overflow_at_64bits) {}
#define ID_AA64DFR0_PERFMON_MASK 0xf
#define ID_DFR0_PMU_NOTIMPL 0b0000
-#define ID_DFR0_PMU_V3 0b0001
+#define ID_DFR0_PMU_V3 0b0011
#define ID_DFR0_PMU_V3_8_1 0b0100
#define ID_DFR0_PMU_V3_8_4 0b0101
#define ID_DFR0_PMU_V3_8_5 0b0110
@@ -286,6 +286,11 @@ static void test_event_introspection(void)
return;
}
+ if (pmu.version < ID_DFR0_PMU_V3) {
+ report_skip("PMUv3 extensions not supported, skip ...");
+ return;
+ }
+
/* PMUv3 requires an implementation includes some common events */
required_events = is_event_supported(SW_INCR, true) &&
is_event_supported(CPU_CYCLES, true) &&
--
2.39.2
