From 778fcd9562b1acaa659e138d2ed22862908957b3 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Sat, 21 Mar 2020 18:09:04 -0400 Subject: [PATCH] target/arm: Check aa32_pan in take_aarch32_exception(), not aa64_pan In take_aarch32_exception(), we know we are dealing with a CPU that has AArch32, so the right isar_feature test is aa32_pan, not aa64_pan. Backports commit f8af1143ef93954e77cf59e09b5e004dafbd64fd from qemu --- 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 7465344b..ccb51652 100644 --- a/qemu/target/arm/helper.c +++ b/qemu/target/arm/helper.c @@ -8633,7 +8633,7 @@ static void take_aarch32_exception(CPUARMState *env, int new_mode, env->elr_el[2] = env->regs[15]; } else { /* CPSR.PAN is normally preserved preserved unless... */ - if (cpu_isar_feature(aa64_pan, env_archcpu(env))) { + if (cpu_isar_feature(aa32_pan, env_archcpu(env))) { switch (new_el) { case 3: if (!arm_is_secure_below_el3(env)) {