diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2022-08-22 08:26:53 -0700 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2022-09-22 16:38:28 +0100 |
| commit | 957a0bb751e9b87c85118a2f55871d981df78d20 (patch) | |
| tree | ed659e6d979c63817ece7305cc2bc36c9d853cda | |
| parent | 1a469cf78d45a711fb5fce3cbbb325917d17895a (diff) | |
| download | qemu-957a0bb751e9b87c85118a2f55871d981df78d20.zip qemu-957a0bb751e9b87c85118a2f55871d981df78d20.tar.gz qemu-957a0bb751e9b87c85118a2f55871d981df78d20.tar.bz2 | |
target/arm: Add secure parameter to get_phys_addr_pmsav7
Remove the use of regime_is_secure from get_phys_addr_pmsav7,
using the new parameter instead.
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220822152741.1617527-19-richard.henderson@linaro.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | target/arm/ptw.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 9e1f60d..1e81eef 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -1510,12 +1510,11 @@ static bool pmsav7_use_background_region(ARMCPU *cpu, ARMMMUIdx mmu_idx, static bool get_phys_addr_pmsav7(CPUARMState *env, uint32_t address, MMUAccessType access_type, ARMMMUIdx mmu_idx, - GetPhysAddrResult *result, + bool secure, GetPhysAddrResult *result, ARMMMUFaultInfo *fi) { ARMCPU *cpu = env_archcpu(env); int n; - bool secure = regime_is_secure(env, mmu_idx); bool is_user = regime_is_user(env, mmu_idx); result->phys = address; @@ -2418,7 +2417,7 @@ bool get_phys_addr(CPUARMState *env, target_ulong address, } else if (arm_feature(env, ARM_FEATURE_V7)) { /* PMSAv7 */ ret = get_phys_addr_pmsav7(env, address, access_type, mmu_idx, - result, fi); + is_secure, result, fi); } else { /* Pre-v7 MPU */ ret = get_phys_addr_pmsav5(env, address, access_type, mmu_idx, |