[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/11] target/arm: Update arm_mmu_idx_el for PAN
|
From: |
Richard Henderson |
|
Subject: |
[PATCH 07/11] target/arm: Update arm_mmu_idx_el for PAN |
|
Date: |
Tue, 3 Dec 2019 14:53:29 -0800 |
Examine the PAN bit for EL1, EL2, and Secure EL1 to
determine if it applies.
Signed-off-by: Richard Henderson <address@hidden>
---
target/arm/helper.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index 512be5c644..6c65dd799e 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -11770,13 +11770,22 @@ ARMMMUIdx arm_mmu_idx_el(CPUARMState *env, int el)
return ARMMMUIdx_EL10_0;
case 1:
if (arm_is_secure_below_el3(env)) {
+ if (env->pstate & PSTATE_PAN) {
+ return ARMMMUIdx_SE1_PAN;
+ }
return ARMMMUIdx_SE1;
}
+ if (env->pstate & PSTATE_PAN) {
+ return ARMMMUIdx_EL10_1_PAN;
+ }
return ARMMMUIdx_EL10_1;
case 2:
/* TODO: ARMv8.4-SecEL2 */
/* Note that TGE does not apply at EL2. */
if ((env->cp15.hcr_el2 & HCR_E2H) && arm_el_is_aa64(env, 2)) {
+ if (env->pstate & PSTATE_PAN) {
+ return ARMMMUIdx_EL20_2_PAN;
+ }
return ARMMMUIdx_EL20_2;
}
return ARMMMUIdx_E2;
--
2.17.1
- [PATCH 00/11] target/arm: Implement ARMv8.1-PAN + ARMv8.2-ATS1E1, Richard Henderson, 2019/12/03
- [PATCH 02/11] target/arm: Add arm_mmu_idx_is_stage1, Richard Henderson, 2019/12/03
- [PATCH 01/11] cputlb: Handle NB_MMU_MODES > TARGET_PAGE_BITS_MIN, Richard Henderson, 2019/12/03
- [PATCH 04/11] target/arm: Reduce CPSR_RESERVED, Richard Henderson, 2019/12/03
- [PATCH 06/11] target/arm: Update MSR access for PAN, Richard Henderson, 2019/12/03
- [PATCH 07/11] target/arm: Update arm_mmu_idx_el for PAN,
Richard Henderson <=
- [PATCH 05/11] target/arm: Add isar_feature tests for PAN + ATS1E1, Richard Henderson, 2019/12/03
- [PATCH 03/11] target/arm: Add mmu_idx for EL1 and EL2 w/ PAN enabled, Richard Henderson, 2019/12/03
- [PATCH 09/11] target/arm: Set PAN bit as required on exception entry, Richard Henderson, 2019/12/03
- [PATCH 08/11] target/arm: Enforce PAN semantics in get_S1prot, Richard Henderson, 2019/12/03
- [PATCH 11/11] target/arm: Enable ARMv8.2-ATS1E1 in -cpu max, Richard Henderson, 2019/12/03