[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-8.0 v4 03/21] target/arm: SCR_EL3.NS may be RES1
From: |
Richard Henderson |
Subject: |
[PATCH for-8.0 v4 03/21] target/arm: SCR_EL3.NS may be RES1 |
Date: |
Mon, 27 Feb 2023 13:01:04 -1000 |
With RME, SEL2 must also be present to support secure state.
The NS bit is RES1 if SEL2 is not present.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/arm/helper.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index 66c578c360..20e28d5e09 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -1856,6 +1856,9 @@ static void scr_write(CPUARMState *env, const
ARMCPRegInfo *ri, uint64_t value)
}
if (cpu_isar_feature(aa64_sel2, cpu)) {
valid_mask |= SCR_EEL2;
+ } else if (cpu_isar_feature(aa64_rme, cpu)) {
+ /* With RME and without SEL2, NS is RES1 (R_GSWWH, I_DJJQJ). */
+ value |= SCR_NS;
}
if (cpu_isar_feature(aa64_mte, cpu)) {
valid_mask |= SCR_ATA;
--
2.34.1
- [PATCH for-8.0 v4 00/21] target/arm: Implement FEAT_RME, Richard Henderson, 2023/02/27
- [PATCH for-8.0 v4 01/21] target/arm: Add isar_feature_aa64_rme, Richard Henderson, 2023/02/27
- [PATCH for-8.0 v4 02/21] target/arm: Update SCR and HCR for RME, Richard Henderson, 2023/02/27
- [PATCH for-8.0 v4 03/21] target/arm: SCR_EL3.NS may be RES1,
Richard Henderson <=
- [PATCH for-8.0 v4 04/21] target/arm: Add RME cpregs, Richard Henderson, 2023/02/27
- [PATCH for-8.0 v4 06/21] include/exec/memattrs: Add two bits of space to MemTxAttrs, Richard Henderson, 2023/02/27
- [PATCH for-8.0 v4 07/21] target/arm: Adjust the order of Phys and Stage2 ARMMMUIdx, Richard Henderson, 2023/02/27
- [PATCH for-8.0 v4 05/21] target/arm: Introduce ARMSecuritySpace, Richard Henderson, 2023/02/27
- [PATCH for-8.0 v4 08/21] target/arm: Introduce ARMMMUIdx_Phys_{Realm, Root}, Richard Henderson, 2023/02/27
- [PATCH for-8.0 v4 16/21] target/arm: Use get_phys_addr_with_struct for stage2, Richard Henderson, 2023/02/27
- [PATCH for-8.0 v4 15/21] target/arm: Move s1_is_el0 into S1Translate, Richard Henderson, 2023/02/27
- [PATCH for-8.0 v4 10/21] target/arm: Pipe ARMSecuritySpace through ptw.c, Richard Henderson, 2023/02/27
- [PATCH for-8.0 v4 09/21] target/arm: Remove __attribute__((nonnull)) from ptw.c, Richard Henderson, 2023/02/27
- [PATCH for-8.0 v4 14/21] target/arm: Use get_phys_addr_with_struct in S1_ptw_translate, Richard Henderson, 2023/02/27