mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/arm: Add is_secure parameter to regime_translation_disabled

Browse Source 
Remove the use of regime_is_secure from regime_translation_disabled,
using the new parameter instead.

This fixes a bug in S1_ptw_translate and get_phys_addr where we had
passed ARMMMUIdx_Stage2 and not ARMMMUIdx_Stage2_S to determine if
Stage2 is disabled, affecting FEAT_SEL2.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20221001162318.153420-5-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2022-10-01 09:22:40 -07:00 committed by Peter Maydell
parent bf25b7b079
commit 7e80c0a4ff
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
target/arm/ptw.c
View File

@ -131,12 +131,13 @@ static uint64_t regime_ttbr(CPUARMState *env, ARMMMUIdx mmu_idx, int ttbrn)
} }
/* Return true if the specified stage of address translation is disabled */ /* Return true if the specified stage of address translation is disabled */
static bool regime_translation_disabled(CPUARMState *env, ARMMMUIdx mmu_idx) static bool regime_translation_disabled(CPUARMState *env, ARMMMUIdx mmu_idx,
bool is_secure)
{ {
uint64_t hcr_el2; uint64_t hcr_el2;
if (arm_feature(env, ARM_FEATURE_M)) { if (arm_feature(env, ARM_FEATURE_M)) {
switch (env->v7m.mpu_ctrl[regime_is_secure(env, mmu_idx)] & switch (env->v7m.mpu_ctrl[is_secure] &
(R_V7M_MPU_CTRL_ENABLE_MASK | R_V7M_MPU_CTRL_HFNMIENA_MASK)) { (R_V7M_MPU_CTRL_ENABLE_MASK | R_V7M_MPU_CTRL_HFNMIENA_MASK)) {
case R_V7M_MPU_CTRL_ENABLE_MASK: case R_V7M_MPU_CTRL_ENABLE_MASK:
/* Enabled, but not for HardFault and NMI */ /* Enabled, but not for HardFault and NMI */
@ -163,7 +164,7 @@ static bool regime_translation_disabled(CPUARMState *env, ARMMMUIdx mmu_idx)
if (hcr_el2 & HCR_TGE) { if (hcr_el2 & HCR_TGE) {
/* TGE means that NS EL0/1 act as if SCTLR_EL1.M is zero */ /* TGE means that NS EL0/1 act as if SCTLR_EL1.M is zero */
if (!regime_is_secure(env, mmu_idx) && regime_el(env, mmu_idx) == 1) { if (!is_secure && regime_el(env, mmu_idx) == 1) {
return true; return true;
} }
} }
@ -203,7 +204,7 @@ static hwaddr S1_ptw_translate(CPUARMState *env, ARMMMUIdx mmu_idx,
ARMMMUIdx s2_mmu_idx = *is_secure ? ARMMMUIdx_Stage2_S : ARMMMUIdx_Stage2; ARMMMUIdx s2_mmu_idx = *is_secure ? ARMMMUIdx_Stage2_S : ARMMMUIdx_Stage2;
if (arm_mmu_idx_is_stage1_of_2(mmu_idx) && if (arm_mmu_idx_is_stage1_of_2(mmu_idx) &&
!regime_translation_disabled(env, s2_mmu_idx)) { !regime_translation_disabled(env, s2_mmu_idx, *is_secure)) {
GetPhysAddrResult s2 = {}; GetPhysAddrResult s2 = {};
int ret; int ret;
@ -1357,7 +1358,7 @@ static bool get_phys_addr_pmsav5(CPUARMState *env, uint32_t address,
uint32_t base; uint32_t base;
bool is_user = regime_is_user(env, mmu_idx); bool is_user = regime_is_user(env, mmu_idx);
if (regime_translation_disabled(env, mmu_idx)) { if (regime_translation_disabled(env, mmu_idx, is_secure)) {
/* MPU disabled. */ /* MPU disabled. */
result->phys = address; result->phys = address;
result->prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC; result->prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC;
@ -1521,7 +1522,7 @@ static bool get_phys_addr_pmsav7(CPUARMState *env, uint32_t address,
result->page_size = TARGET_PAGE_SIZE; result->page_size = TARGET_PAGE_SIZE;
result->prot = 0; result->prot = 0;
if (regime_translation_disabled(env, mmu_idx) || if (regime_translation_disabled(env, mmu_idx, secure) ||
m_is_ppb_region(env, address)) { m_is_ppb_region(env, address)) {
/* /*
* MPU disabled or M profile PPB access: use default memory map. * MPU disabled or M profile PPB access: use default memory map.
@ -1733,7 +1734,7 @@ bool pmsav8_mpu_lookup(CPUARMState *env, uint32_t address,
* are done in arm_v7m_load_vector(), which always does a direct * are done in arm_v7m_load_vector(), which always does a direct
* read using address_space_ldl(), rather than going via this function. * read using address_space_ldl(), rather than going via this function.
*/ */
if (regime_translation_disabled(env, mmu_idx)) { /* MPU disabled */ if (regime_translation_disabled(env, mmu_idx, secure)) { /* MPU disabled */
hit = true; hit = true;
} else if (m_is_ppb_region(env, address)) { } else if (m_is_ppb_region(env, address)) {
hit = true; hit = true;
@ -2307,7 +2308,8 @@ bool get_phys_addr(CPUARMState *env, target_ulong address,
result, fi); result, fi);
/* 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,
is_secure)) {
return ret; return ret;
} }
@ -2437,7 +2439,7 @@ bool get_phys_addr(CPUARMState *env, target_ulong address,
/* Definitely a real MMU, not an MPU */ /* Definitely a real MMU, not an MPU */
if (regime_translation_disabled(env, mmu_idx)) { if (regime_translation_disabled(env, mmu_idx, is_secure)) {
uint64_t hcr; uint64_t hcr;
uint8_t memattr; uint8_t memattr;