From 97702da7ad9f7841ea44749864753e0b04a8b913 Mon Sep 17 00:00:00 2001 From: Aaron Lindsay Date: Mon, 1 Mar 2021 18:25:16 -0500 Subject: [PATCH] target/arm: Count PMU events when MDCR.SPME is set This check was backwards when introduced in commit 033614c47de78409ad3fb39bb7bd1483b71c6789: target/arm: Filter cycle counter based on PMCCFILTR_EL0 Backports commit db1f3afb17269cf2bd86c222e1bced748487ef71 --- qemu/target/arm/helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu/target/arm/helper.c b/qemu/target/arm/helper.c index 4b532766..5dd617e5 100644 --- a/qemu/target/arm/helper.c +++ b/qemu/target/arm/helper.c @@ -1191,7 +1191,7 @@ static bool pmu_counter_enabled(CPUARMState *env, uint8_t counter) } } else { prohibited = arm_feature(env, ARM_FEATURE_EL3) && - (env->cp15.mdcr_el3 & MDCR_SPME); + !(env->cp15.mdcr_el3 & MDCR_SPME); } if (prohibited && counter == 31) {