diff options
author | Rémi Denis-Courmont | 2021-01-12 11:45:09 +0100 |
---|---|---|
committer | Peter Maydell | 2021-01-19 15:38:52 +0100 |
commit | 926c1b97895879b78ca14bca2831c08740ed1c38 (patch) | |
tree | 2a674ee6fc5e4922d867097311304ca011837cbb /target/arm/translate.c | |
parent | target/arm: revector to run-time pick target EL (diff) | |
download | qemu-926c1b97895879b78ca14bca2831c08740ed1c38.tar.gz qemu-926c1b97895879b78ca14bca2831c08740ed1c38.tar.xz qemu-926c1b97895879b78ca14bca2831c08740ed1c38.zip |
target/arm: Implement SCR_EL2.EEL2
This adds handling for the SCR_EL3.EEL2 bit.
Signed-off-by: Rémi Denis-Courmont <remi.denis.courmont@huawei.com>
Message-id: 20210112104511.36576-17-remi.denis.courmont@huawei.com
[PMM: Applied fixes for review issues noted by RTH:
- check for FEATURE_AARCH64 before checking sel2 isar feature
- correct the commit message subject line]
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target/arm/translate.c')
-rw-r--r-- | target/arm/translate.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/target/arm/translate.c b/target/arm/translate.c index 614a6853ca..1653cca1aa 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -2832,9 +2832,20 @@ static bool msr_banked_access_decode(DisasContext *s, int r, int sysm, int rn, } if (s->current_el == 1) { /* If we're in Secure EL1 (which implies that EL3 is AArch64) - * then accesses to Mon registers trap to EL3 + * then accesses to Mon registers trap to Secure EL2, if it exists, + * otherwise EL3. */ - TCGv_i32 tcg_el = tcg_const_i32(3); + TCGv_i32 tcg_el; + + if (arm_dc_feature(s, ARM_FEATURE_AARCH64) && + dc_isar_feature(aa64_sel2, s)) { + /* Target EL is EL<3 minus SCR_EL3.EEL2> */ + tcg_el = load_cpu_field(cp15.scr_el3); + tcg_gen_sextract_i32(tcg_el, tcg_el, ctz32(SCR_EEL2), 1); + tcg_gen_addi_i32(tcg_el, tcg_el, 3); + } else { + tcg_el = tcg_const_i32(3); + } gen_exception_el(s, EXCP_UDEF, syn_uncategorized(), tcg_el); tcg_temp_free_i32(tcg_el); |