[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 12/19] target/arm: translate NS bit in page-walks
From: |
remi . denis . courmont |
Subject: |
[PATCH 12/19] target/arm: translate NS bit in page-walks |
Date: |
Tue, 12 Jan 2021 12:45:04 +0200 |
From: Rémi Denis-Courmont <remi.denis.courmont@huawei.com>
Signed-off-by: Rémi Denis-Courmont <remi.denis.courmont@huawei.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
target/arm/helper.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index 7d96897f9a..fe95c2965d 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -10429,6 +10429,18 @@ static hwaddr S1_ptw_translate(CPUARMState *env,
ARMMMUIdx mmu_idx,
fi->s1ptw = true;
return ~0;
}
+
+ if (arm_is_secure_below_el3(env)) {
+ /* Check if page table walk is to secure or non-secure PA space. */
+ if (*is_secure) {
+ *is_secure = !(env->cp15.vstcr_el2.raw_tcr & VSTCR_SW);
+ } else {
+ *is_secure = !(env->cp15.vtcr_el2.raw_tcr & VTCR_NSW);
+ }
+ } else {
+ assert(!*is_secure);
+ }
+
addr = s2pa;
}
return addr;
--
2.30.0
- [PATCH 02/19] target/arm: add arm_is_el2_enabled() helper, (continued)
- [PATCH 02/19] target/arm: add arm_is_el2_enabled() helper, remi . denis . courmont, 2021/01/12
- [PATCH 05/19] target/arm: factor MDCR_EL2 common handling, remi . denis . courmont, 2021/01/12
- [PATCH 08/19] target/arm: add MMU stage 1 for Secure EL2, remi . denis . courmont, 2021/01/12
- [PATCH 10/19] target/arm: handle VMID change in secure state, remi . denis . courmont, 2021/01/12
- [PATCH 09/19] target/arm: add ARMv8.4-SEL2 system registers, remi . denis . courmont, 2021/01/12
- [PATCH 06/19] target/arm: declare new AA64PFR0 bit-fields, remi . denis . courmont, 2021/01/12
- [PATCH 03/19] target/arm: use arm_is_el2_enabled() where applicable, remi . denis . courmont, 2021/01/12
- [PATCH 11/19] target/arm: do S1_ptw_translate() before address space lookup, remi . denis . courmont, 2021/01/12
- [PATCH 14/19] target/arm: secure stage 2 translation regime, remi . denis . courmont, 2021/01/12
- [PATCH 12/19] target/arm: translate NS bit in page-walks,
remi . denis . courmont <=
- [PATCH 07/19] target/arm: add 64-bit S-EL2 to EL exception table, remi . denis . courmont, 2021/01/12
- [PATCH 17/19] target/arm: add ARMv8.4-SEL2 extension, remi . denis . courmont, 2021/01/12
- [PATCH 13/19] target/arm: generalize 2-stage page-walk condition, remi . denis . courmont, 2021/01/12
- [PATCH 16/19] target/arm: revector to run-time pick target EL, remi . denis . courmont, 2021/01/12
- [PATCH 18/19] target/arm: enable Secure EL2 in max CPU, remi . denis . courmont, 2021/01/12
- [PATCH 19/19] target/arm: refactor vae1_tlbmask(), remi . denis . courmont, 2021/01/12