OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/arm: generalize 2-stage page-walk condition

Browse Source 
The stage_1_mmu_idx() already effectively keeps track of which
translation regimes have two stages. Don't hard-code another test.

Signed-off-by: Rémi Denis-Courmont <remi.denis.courmont@huawei.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210112104511.36576-13-remi.denis.courmont@huawei.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Rémi Denis-Courmont 2021-01-12 12:45:05 +02:00 committed by Peter Maydell
parent 588c6dd113
commit 7879460a61
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
target/arm/helper.c
View File

@ -12160,11 +12160,11 @@ bool get_phys_addr(CPUARMState *env, target_ulong address,
target_ulong *page_size, target_ulong *page_size,
ARMMMUFaultInfo *fi, ARMCacheAttrs *cacheattrs) ARMMMUFaultInfo *fi, ARMCacheAttrs *cacheattrs)
{ {
if (mmu_idx == ARMMMUIdx_E10_0 || ARMMMUIdx s1_mmu_idx = stage_1_mmu_idx(mmu_idx);
mmu_idx == ARMMMUIdx_E10_1 ||
mmu_idx == ARMMMUIdx_E10_1_PAN) { if (mmu_idx != s1_mmu_idx) {
/* Call ourselves recursively to do the stage 1 and then stage 2 /* Call ourselves recursively to do the stage 1 and then stage 2
* translations. * translations if mmu_idx is a two-stage regime.
*/ */
if (arm_feature(env, ARM_FEATURE_EL2)) { if (arm_feature(env, ARM_FEATURE_EL2)) {
hwaddr ipa; hwaddr ipa;
@ -12172,9 +12172,8 @@ bool get_phys_addr(CPUARMState *env, target_ulong address,
int ret; int ret;
ARMCacheAttrs cacheattrs2 = {}; ARMCacheAttrs cacheattrs2 = {};
ret = get_phys_addr(env, address, access_type, ret = get_phys_addr(env, address, access_type, s1_mmu_idx, &ipa,
stage_1_mmu_idx(mmu_idx), &ipa, attrs, attrs, prot, page_size, fi, cacheattrs);
prot, page_size, fi, cacheattrs);
/* If S1 fails or S2 is disabled, return early. */ /* If S1 fails or S2 is disabled, return early. */
if (ret || regime_translation_disabled(env, ARMMMUIdx_Stage2)) { if (ret || regime_translation_disabled(env, ARMMMUIdx_Stage2)) {