From: Aaron Lindsay <alind...@codeaurora.org> Signed-off-by: Aaron Lindsay <alind...@codeaurora.org> Reviewed-by: Peter Maydell <peter.mayd...@linaro.org> Message-id: 1523997485-1905-2-git-send-email-alind...@codeaurora.org Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> --- target/arm/helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/arm/helper.c b/target/arm/helper.c index 0fa02c31e1..1526724d64 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -994,7 +994,7 @@ static inline bool arm_ccnt_enabled(CPUARMState *env) { /* This does not support checking PMCCFILTR_EL0 register */ - if (!(env->cp15.c9_pmcr & PMCRE)) { + if (!(env->cp15.c9_pmcr & PMCRE) || !(env->cp15.c9_pmcnten & (1 << 31))) { return false; } -- 2.17.0