diff options
author | Richard Henderson <richard.henderson@linaro.org> | 2024-04-22 10:07:22 -0700 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2024-04-30 15:01:07 +0100 |
commit | 7b19a3554d2df22d29c75319a1dac17615d1b20e (patch) | |
tree | 8e18b57d647f6562d854055d20302a633a7fb8e3 | |
parent | a8aa8af99f87f20beca58f647a347ba576d59444 (diff) | |
download | qemu-7b19a3554d2df22d29c75319a1dac17615d1b20e.zip qemu-7b19a3554d2df22d29c75319a1dac17615d1b20e.tar.gz qemu-7b19a3554d2df22d29c75319a1dac17615d1b20e.tar.bz2 |
target/arm: Restrict translation disabled alignment check to VMSA
For cpus using PMSA, when the MPU is disabled, the default memory
type is Normal, Non-cachable. This means that it should not
have alignment restrictions enforced.
Cc: qemu-stable@nongnu.org
Fixes: 59754f85ed3 ("target/arm: Do memory type alignment check when translation disabled")
Reported-by: Clément Chigot <chigot@adacore.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Clément Chigot <chigot@adacore.com>
Message-id: 20240422170722.117409-1-richard.henderson@linaro.org
[PMM: trivial comment, commit message tweaks]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r-- | target/arm/tcg/hflags.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/target/arm/tcg/hflags.c b/target/arm/tcg/hflags.c index 5da1b0f..f03977b 100644 --- a/target/arm/tcg/hflags.c +++ b/target/arm/tcg/hflags.c @@ -38,8 +38,16 @@ static bool aprofile_require_alignment(CPUARMState *env, int el, uint64_t sctlr) } /* - * If translation is disabled, then the default memory type is - * Device(-nGnRnE) instead of Normal, which requires that alignment + * With PMSA, when the MPU is disabled, all memory types in the + * default map are Normal, so don't need aligment enforcing. + */ + if (arm_feature(env, ARM_FEATURE_PMSA)) { + return false; + } + + /* + * With VMSA, if translation is disabled, then the default memory type + * is Device(-nGnRnE) instead of Normal, which requires that alignment * be enforced. Since this affects all ram, it is most efficient * to handle this during translation. */ |