target/arm: honor HCR_E2H and HCR_TGE in ats_write64()
PATCH v2 1/1 target/arm: honor HCR_E2H and HCR_TGE in ats_write64()
We need to check HCR_E2H and HCR_TGE to select the right MMU index for the correct translation regime.
To check for EL2&0 translation regime:
- For S1E0*, S1E1* and S12E* ops, check both HCR_E2H and HCR_TGE
- For S1E2* ops, check only HCR_E2H
---
v2:
- Rebase with the latest upstream
- It turns out that we need to check both HCR_E2H and HCR_TGE for S1E0*, S1E1* and S12E* address translation as well according to the Architecture Manual.
v1:
https://lists.gnu.org/archive/html/qemu-devel/2022-10/msg02627.html
target/arm/helper.c | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-)
target/arm/helper.c +32 -6
@@ -3501,19 +3501,33 @@ static void ats_write64(CPUARMState *env, const ARMCPRegInfo *ri,MMUAccessType access_type = ri->opc2 &1 ?MMU_DATA_STORE :MMU_DATA_LOAD ;ARMMMUIdx mmu_idx;int secure =arm_is_secure_below_el3 (env); +bool regime_e20 = (arm_hcr_el2_eff (env) & (HCR_E2H |HCR_TGE )) == + (HCR_E2H |HCR_TGE );switch (ri->opc2 &6 ) {case 0 :switch (ri->opc1) {case 0 :/* AT S1E1R, AT S1E1W, AT S1E1RP, AT S1E1WP */ if (ri->crm ==9 && (env->pstate &PSTATE_PAN )) { - mmu_idx = ARMMMUIdx_Stage1_E1_PAN; +if (regime_e20) { + mmu_idx = ARMMMUIdx_E20_2_PAN; + }else { + mmu_idx = ARMMMUIdx_Stage1_E1_PAN; + } }else { - mmu_idx = ARMMMUIdx_Stage1_E1; +if (regime_e20) { + mmu_idx = ARMMMUIdx_E20_2; + }else { + mmu_idx = ARMMMUIdx_Stage1_E1; + } }break ;case 4 :/* AT S1E2R, AT S1E2W */ - mmu_idx = ARMMMUIdx_E2; +if ((arm_hcr_el2_eff (env) &HCR_E2H ) ==HCR_E2H ) { + mmu_idx = ARMMMUIdx_E20_2; + }else { + mmu_idx = ARMMMUIdx_E2; + }break ;case 6 :/* AT S1E3R, AT S1E3W */ mmu_idx = ARMMMUIdx_E3;
@@ -3524,13 +3538,25 @@ static void ats_write64(CPUARMState *env, const ARMCPRegInfo *ri, }break ;case 2 :/* AT S1E0R, AT S1E0W */ - mmu_idx = ARMMMUIdx_Stage1_E0; +if (regime_e20) { + mmu_idx = ARMMMUIdx_E20_0; + }else { + mmu_idx = ARMMMUIdx_Stage1_E0; + }break ;case 4 :/* AT S12E1R, AT S12E1W */ - mmu_idx = ARMMMUIdx_E10_1; +if (regime_e20) { + mmu_idx = ARMMMUIdx_E20_2; + }else { + mmu_idx = ARMMMUIdx_E10_1; + }break ;case 6 :/* AT S12E0R, AT S12E0W */ - mmu_idx = ARMMMUIdx_E10_0; +if (regime_e20) { + mmu_idx = ARMMMUIdx_E20_0; + }else { + mmu_idx = ARMMMUIdx_E10_0; + }break ;default :g_assert_not_reached ();
Signature · 1 line
2.25.1
Quoted 27 lines · Ake Koomsin
We need to check
HCR_E2HandHCR_TGEto select the right MMU index for the correct translation regime.To check for EL2&0 translation regime:
- For S1E0*, S1E1* and S12E* ops, check bothHCR_E2HandHCR_TGE
- For S1E2* ops, check onlyHCR_E2HSigned-off-by Ake Koomsin <[email protected]>---
v2:
- Rebase with the latest upstream
- It turns out that we need to check bothHCR_E2HandHCR_TGEfor S1E0*, S1E1* and S12E* address translation as well according to the Architecture Manual.v1:
https://lists.gnu.org/archive/html/qemu-devel/2022-10/msg02627.htmltarget/arm/helper.c | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-)target/arm/helper.c +0
-0
target/arm/helper.c static void ats_write64(CPUARMState *env, const ARMCPRegInfo *ri, · line 3505
Quoted 5 lines
target/arm/helper.c +2
-0@@ -3501,19 +3501,33 @@ static void ats_write64(CPUARMState *env, const ARMCPRegInfo *ri,MMUAccessType access_type = ri->opc2 &1 ?MMU_DATA_STORE :MMU_DATA_LOAD ;ARMMMUIdx mmu_idx;int secure =arm_is_secure_below_el3 (env); +bool regime_e20 = (arm_hcr_el2_eff (env) & (HCR_E2H |HCR_TGE )) == + (HCR_E2H |HCR_TGE );
Record arm_hcr_el2_eff in a local here...
target/arm/helper.c static void ats_write64(CPUARMState *env, const ARMCPRegInfo *ri, · line 3526
Quoted 3 lines
target/arm/helper.c +1
-1case 4 :/* AT S1E2R, AT S1E2W */ - mmu_idx = ARMMMUIdx_E2; +if ((arm_hcr_el2_eff (env) &HCR_E2H ) ==HCR_E2H ) {
... so you don't need to recompute it here.
Also, you can drop the "==" since HCR_E2H is a single bit.
The rest could perhaps be more compact with "?:", but is ok.
r~