diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2023-06-23 11:15:47 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2023-06-23 11:15:47 +0100 |
| commit | a5c7765202f3afcc1e0bf4ae87a89bffcfb50b33 (patch) | |
| tree | 51481fcae1b22fc94128cf773338b430fb5e45d4 /target/arm/ptw.c | |
| parent | 7c19b2d6d9c67910812da976c968500a1d6eb170 (diff) | |
| download | qemu-a5c7765202f3afcc1e0bf4ae87a89bffcfb50b33.zip qemu-a5c7765202f3afcc1e0bf4ae87a89bffcfb50b33.tar.gz qemu-a5c7765202f3afcc1e0bf4ae87a89bffcfb50b33.tar.bz2 | |
target/arm: Use get_phys_addr_with_struct for stage2
This fixes a bug in which we failed to initialize
the result attributes properly after the memset.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20230620124418.805717-17-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target/arm/ptw.c')
| -rw-r--r-- | target/arm/ptw.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 558b4b7..7c4526e 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -39,10 +39,6 @@ typedef struct S1Translate { void *out_host; } S1Translate; -static bool get_phys_addr_lpae(CPUARMState *env, S1Translate *ptw, - uint64_t address, MMUAccessType access_type, - GetPhysAddrResult *result, ARMMMUFaultInfo *fi); - static bool get_phys_addr_with_struct(CPUARMState *env, S1Translate *ptw, target_ulong address, MMUAccessType access_type, @@ -2886,12 +2882,7 @@ static bool get_phys_addr_twostage(CPUARMState *env, S1Translate *ptw, cacheattrs1 = result->cacheattrs; memset(result, 0, sizeof(*result)); - if (arm_feature(env, ARM_FEATURE_PMSA)) { - ret = get_phys_addr_pmsav8(env, ipa, access_type, - ptw->in_mmu_idx, is_secure, result, fi); - } else { - ret = get_phys_addr_lpae(env, ptw, ipa, access_type, result, fi); - } + ret = get_phys_addr_with_struct(env, ptw, ipa, access_type, result, fi); fi->s2addr = ipa; /* Combine the S1 and S2 perms. */ |