[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 12/20] target/arm: Update arm_mmu_idx_el for PAN
From: |
Richard Henderson |
Subject: |
[PATCH v4 12/20] target/arm: Update arm_mmu_idx_el for PAN |
Date: |
Sat, 8 Feb 2020 12:58:08 +0000 |
Examine the PAN bit for EL1, EL2, and Secure EL1 to
determine if it applies.
Reviewed-by: Alex Bennée <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
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 058fb23959..f6a600aa00 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -11895,13 +11895,22 @@ ARMMMUIdx arm_mmu_idx_el(CPUARMState *env, int el)
return ARMMMUIdx_E10_0;
case 1:
if (arm_is_secure_below_el3(env)) {
+ if (env->pstate & PSTATE_PAN) {
+ return ARMMMUIdx_SE10_1_PAN;
+ }
return ARMMMUIdx_SE10_1;
}
+ if (env->pstate & PSTATE_PAN) {
+ return ARMMMUIdx_E10_1_PAN;
+ }
return ARMMMUIdx_E10_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_E20_2_PAN;
+ }
return ARMMMUIdx_E20_2;
}
return ARMMMUIdx_E2;
--
2.20.1
- [PATCH v4 05/20] target/arm: Split out aarch32_cpsr_valid_mask, (continued)
- [PATCH v4 05/20] target/arm: Split out aarch32_cpsr_valid_mask, Richard Henderson, 2020/02/08
- [PATCH v4 06/20] target/arm: Mask CPSR_J when Jazelle is not enabled, Richard Henderson, 2020/02/08
- [PATCH v4 08/20] target/arm: Use aarch32_cpsr_valid_mask in helper_exception_return, Richard Henderson, 2020/02/08
- [PATCH v4 07/20] target/arm: Replace CPSR_ERET_MASK with aarch32_cpsr_valid_mask, Richard Henderson, 2020/02/08
- [PATCH v4 09/20] target/arm: Remove CPSR_RESERVED, Richard Henderson, 2020/02/08
- [PATCH v4 10/20] target/arm: Introduce aarch64_pstate_valid_mask, Richard Henderson, 2020/02/08
- [PATCH v4 11/20] target/arm: Update MSR access for PAN, Richard Henderson, 2020/02/08
- [PATCH v4 12/20] target/arm: Update arm_mmu_idx_el for PAN,
Richard Henderson <=
- [PATCH v4 13/20] target/arm: Enforce PAN semantics in get_S1prot, Richard Henderson, 2020/02/08
- [PATCH v4 14/20] target/arm: Set PAN bit as required on exception entry, Richard Henderson, 2020/02/08
- [PATCH v4 15/20] target/arm: Implement ATS1E1 system registers, Richard Henderson, 2020/02/08
- [PATCH v4 16/20] target/arm: Enable ARMv8.2-ATS1E1 in -cpu max, Richard Henderson, 2020/02/08
- [PATCH v4 17/20] target/arm: Add ID_AA64MMFR2_EL1, Richard Henderson, 2020/02/08
- [PATCH v4 18/20] target/arm: Update MSR access to UAO, Richard Henderson, 2020/02/08
- [PATCH v4 20/20] target/arm: Enable ARMv8.2-UAO in -cpu max, Richard Henderson, 2020/02/08
- [PATCH v4 19/20] target/arm: Implement UAO semantics, Richard Henderson, 2020/02/08
- Re: [PATCH v4 00/20] target/arm: Implement PAN, ATS1E1, UAO, Peter Maydell, 2020/02/11