From: Richard Henderson <richard.henderson@linaro.org>
Date: Tue, 15 Mar 2022 02:12:05 +0000 (-0700)
Subject: target/arm: Fix pauth_check_trap vs SEL2
X-Git-Tag: v7.0.0-rc1~12^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c179d3be7bd03edb717c4b953faa285513b6301f;p=thirdparty%2Fqemu.git

target/arm: Fix pauth_check_trap vs SEL2

When arm_is_el2_enabled was introduced, we missed
updating pauth_check_trap.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/788
Fixes: e6ef0169264b ("target/arm: use arm_is_el2_enabled() where applicable")
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20220315021205.342768-1-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/target/arm/pauth_helper.c b/target/arm/pauth_helper.c
index cd6df18150b..739aa520ddd 100644
--- a/target/arm/pauth_helper.c
+++ b/target/arm/pauth_helper.c
@@ -390,7 +390,7 @@ static void QEMU_NORETURN pauth_trap(CPUARMState *env, int target_el,
 
 static void pauth_check_trap(CPUARMState *env, int el, uintptr_t ra)
 {
-    if (el < 2 && arm_feature(env, ARM_FEATURE_EL2)) {
+    if (el < 2 && arm_is_el2_enabled(env)) {
         uint64_t hcr = arm_hcr_el2_eff(env);
         bool trap = !(hcr & HCR_API);
         if (el == 0) {