diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2024-01-09 14:43:50 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2024-01-09 14:43:50 +0000 |
| commit | f11440b4261fd5db888c300936c0c4537543aed6 (patch) | |
| tree | 9b74742ccee81e2f9025fd39cf8958cb2efc4990 | |
| parent | 7fda076357684b643e1abc0553a1622b25c43a05 (diff) | |
| download | qemu-f11440b4261fd5db888c300936c0c4537543aed6.zip qemu-f11440b4261fd5db888c300936c0c4537543aed6.tar.gz qemu-f11440b4261fd5db888c300936c0c4537543aed6.tar.bz2 | |
target/arm: Don't honour PSTATE.PAN when HCR_EL2.{NV, NV1} == {1, 1}
For FEAT_NV, when HCR_EL2.{NV,NV1} is {1,1} PAN is always disabled
even when the PSTATE.PAN bit is set. Implement this by having
arm_pan_enabled() return false in this situation.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Tested-by: Miguel Luis <miguel.luis@oracle.com>
| -rw-r--r-- | target/arm/helper.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/target/arm/helper.c b/target/arm/helper.c index 1db2eff..24751e0 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -266,6 +266,9 @@ void init_cpreg_list(ARMCPU *cpu) static bool arm_pan_enabled(CPUARMState *env) { if (is_a64(env)) { + if ((arm_hcr_el2_eff(env) & (HCR_NV | HCR_NV1)) == (HCR_NV | HCR_NV1)) { + return false; + } return env->pstate & PSTATE_PAN; } else { return env->uncached_cpsr & CPSR_PAN; |