diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2023-06-23 11:15:43 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2023-06-23 11:15:43 +0100 |
| commit | 87bfbfe7e595372251037c28223919659a294fd3 (patch) | |
| tree | 88ea9236782512c897985043507109cf13e6b770 /target | |
| parent | aa3cc42c016116615b80359ab4dd8a934339aec5 (diff) | |
| download | qemu-87bfbfe7e595372251037c28223919659a294fd3.zip qemu-87bfbfe7e595372251037c28223919659a294fd3.tar.gz qemu-87bfbfe7e595372251037c28223919659a294fd3.tar.bz2 | |
target/arm: SCR_EL3.NS may be RES1
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>
Message-id: 20230620124418.805717-4-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target')
| -rw-r--r-- | target/arm/helper.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/target/arm/helper.c b/target/arm/helper.c index d2f0d92..9132d4d 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -1855,6 +1855,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; |