diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-08-01 11:57:42 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-08-02 17:18:16 +0100 |
| commit | 02ac2f7f613b47f6a5b397b20ab0e6b2e7fb89fa (patch) | |
| tree | 58acff7c744d2891259085cfefca910586519e12 /target | |
| parent | 9bcf2dfa163f67b0fec6ee0fe88ad5dc5d69dc59 (diff) | |
| download | qemu-02ac2f7f613b47f6a5b397b20ab0e6b2e7fb89fa.zip qemu-02ac2f7f613b47f6a5b397b20ab0e6b2e7fb89fa.tar.gz qemu-02ac2f7f613b47f6a5b397b20ab0e6b2e7fb89fa.tar.bz2 | |
target/arm: Avoid bogus NSACR traps on M-profile without Security Extension
In Arm v8.0 M-profile CPUs without the Security Extension and also in
v7M CPUs, there is no NSACR register. However, the code we have to handle
the FPU does not always check whether the ARM_FEATURE_M_SECURITY bit
is set before testing whether env->v7m.nsacr permits access to the
FPU. This means that for a CPU with an FPU but without the Security
Extension we would always take a bogus fault when trying to stack
the FPU registers on an exception entry.
We could fix this by adding extra feature bit checks for all uses,
but it is simpler to just make the internal value of nsacr 0xcff
("all non-secure accesses allowed"), since this is not guest
visible when the Security Extension is not present. This allows
us to continue to follow the Arm ARM pseudocode which takes a
similar approach. (In particular, in the v8.1 Arm ARM the register
is documented as reading as 0xcff in this configuration.)
Fixes: https://bugs.launchpad.net/qemu/+bug/1838475
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Damien Hedde <damien.hedde@greensocs.com>
Message-id: 20190801105742.20036-1-peter.maydell@linaro.org
Diffstat (limited to 'target')
| -rw-r--r-- | target/arm/cpu.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 9eb40ff..ec2ab95 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -266,6 +266,14 @@ static void arm_cpu_reset(CPUState *s) * on ARM_FEATURE_V8 (we don't let the guest see the bit). */ env->v7m.aircr = R_V7M_AIRCR_BFHFNMINS_MASK; + /* + * Set NSACR to indicate "NS access permitted to everything"; + * this avoids having to have all the tests of it being + * conditional on ARM_FEATURE_M_SECURITY. Note also that from + * v8.1M the guest-visible value of NSACR in a CPU without the + * Security Extension is 0xcff. + */ + env->v7m.nsacr = 0xcff; } /* In v7M the reset value of this bit is IMPDEF, but ARM recommends |