ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/arm: Add is_secure parameter to get_phys_addr_v5 

Remove the use of regime_is_secure from get_phys_addr_v5,
passing the new parameter to the lookup instead.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
[PMM: Folded in definition of local is_secure in get_phys_addr(),
 since I dropped the earlier patch that would have provided it]
Message-id: 20220822152741.1617527-14-richard.henderson@linaro.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2022-08-22 08:26:48 -07:00 committed by Peter Maydell
parent e9fb709041
commit b29c85d50c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
target/arm/ptw.c
View File

@ -414,7 +414,8 @@ static int simple_ap_to_rw_prot(CPUARMState *env, ARMMMUIdx mmu_idx, int ap)
static bool get_phys_addr_v5(CPUARMState *env, uint32_t address, static bool get_phys_addr_v5(CPUARMState *env, uint32_t address,
MMUAccessType access_type, ARMMMUIdx mmu_idx, MMUAccessType access_type, ARMMMUIdx mmu_idx,
GetPhysAddrResult *result, ARMMMUFaultInfo *fi) bool is_secure, GetPhysAddrResult *result,
ARMMMUFaultInfo *fi)
{ {
int level = 1; int level = 1;
uint32_t table; uint32_t table;
@ -433,8 +434,7 @@ static bool get_phys_addr_v5(CPUARMState *env, uint32_t address,
fi->type = ARMFault_Translation; fi->type = ARMFault_Translation;
goto do_fault; goto do_fault;
} }
desc = arm_ldl_ptw(env, table, regime_is_secure(env, mmu_idx), desc = arm_ldl_ptw(env, table, is_secure, mmu_idx, fi);
mmu_idx, fi);
if (fi->type != ARMFault_None) { if (fi->type != ARMFault_None) {
goto do_fault; goto do_fault;
} }
@ -472,8 +472,7 @@ static bool get_phys_addr_v5(CPUARMState *env, uint32_t address,
/* Fine pagetable. */ /* Fine pagetable. */
table = (desc & 0xfffff000) | ((address >> 8) & 0xffc); table = (desc & 0xfffff000) | ((address >> 8) & 0xffc);
} }
desc = arm_ldl_ptw(env, table, regime_is_secure(env, mmu_idx), desc = arm_ldl_ptw(env, table, is_secure, mmu_idx, fi);
mmu_idx, fi);
if (fi->type != ARMFault_None) { if (fi->type != ARMFault_None) {
goto do_fault; goto do_fault;
} }
@ -2291,6 +2290,7 @@ bool get_phys_addr(CPUARMState *env, target_ulong address,
GetPhysAddrResult *result, ARMMMUFaultInfo *fi) GetPhysAddrResult *result, ARMMMUFaultInfo *fi)
{ {
ARMMMUIdx s1_mmu_idx = stage_1_mmu_idx(mmu_idx); ARMMMUIdx s1_mmu_idx = stage_1_mmu_idx(mmu_idx);
bool is_secure = regime_is_secure(env, mmu_idx);
if (mmu_idx != s1_mmu_idx) { if (mmu_idx != s1_mmu_idx) {
/* /*
@ -2393,7 +2393,7 @@ bool get_phys_addr(CPUARMState *env, target_ulong address,
* cannot upgrade an non-secure translation regime's attributes * cannot upgrade an non-secure translation regime's attributes
* to secure. * to secure.
*/ */
result->attrs.secure = regime_is_secure(env, mmu_idx); result->attrs.secure = is_secure;
result->attrs.user = regime_is_user(env, mmu_idx); result->attrs.user = regime_is_user(env, mmu_idx);
/* /*
@ -2515,7 +2515,7 @@ bool get_phys_addr(CPUARMState *env, target_ulong address,
result, fi); result, fi);
} else { } else {
return get_phys_addr_v5(env, address, access_type, mmu_idx, return get_phys_addr_v5(env, address, access_type, mmu_idx,
result, fi); is_secure, result, fi);
} }
} }