Message ID | 20200406101205.23027-4-peter.maydell@linaro.org |
---|---|
State | New |
Headers | show |
Series | [PULL,01/11] target/arm: don't expose "ieee_half" via gdbstub | expand |
diff --git a/target/arm/helper.c b/target/arm/helper.c index 163c91a1ccd..ed7eb8ab54e 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -10025,9 +10025,11 @@ static int get_S1prot(CPUARMState *env, ARMMMUIdx mmu_idx, bool is_aa64, prot_rw = user_rw; } else { if (user_rw && regime_is_pan(env, mmu_idx)) { - return 0; + /* PAN forbids data accesses but doesn't affect insn fetch */ + prot_rw = 0; + } else { + prot_rw = simple_ap_to_rw_prot_is_user(ap, false); } - prot_rw = simple_ap_to_rw_prot_is_user(ap, false); } if (ns && arm_is_secure(env) && (env->cp15.scr_el3 & SCR_SIF)) {