From: Aaron Lindsay <aaron@os.amperecomputing.com>
Date: Tue, 25 Aug 2020 14:48:10 +0000 (-0400)
Subject: target/arm: Count PMU events when MDCR.SPME is set
X-Git-Tag: v5.2.0-rc0~115^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db1f3afb17269cf2bd86c222e1bced748487ef71;p=thirdparty%2Fqemu.git

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

Cc: qemu-stable@nongnu.org
Signed-off-by: Aaron Lindsay <aaron@os.amperecomputing.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/target/arm/helper.c b/target/arm/helper.c
index 44d666627a8..88bd9dd35da 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -1452,7 +1452,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) {