SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/arm: Make NV reads of CurrentEL return EL2

Browse Source 
FEAT_NV requires that when HCR_EL2.NV is set reads of the CurrentEL
register from EL1 always report EL2 rather than the real EL.
Implement this.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Tested-by: Miguel Luis <miguel.luis@oracle.com>
This commit is contained in:
Peter Maydell 2024-01-09 14:43:48 +00:00
parent 67d10fc473
commit b7ecc3da6c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target/arm/tcg/translate-a64.c
View File

@ -2241,12 +2241,17 @@ static void handle_sys(DisasContext *s, bool isread,
} }
return; return;
case ARM_CP_CURRENTEL: case ARM_CP_CURRENTEL:
/* Reads as current EL value from pstate, which is {
/*
* Reads as current EL value from pstate, which is
* guaranteed to be constant by the tb flags. * guaranteed to be constant by the tb flags.
* For nested virt we should report EL2.
*/ */
int el = s->nv ? 2 : s->current_el;
tcg_rt = cpu_reg(s, rt); tcg_rt = cpu_reg(s, rt);
tcg_gen_movi_i64(tcg_rt, s->current_el << 2); tcg_gen_movi_i64(tcg_rt, el << 2);
return; return;
}
case ARM_CP_DC_ZVA: case ARM_CP_DC_ZVA:
/* Writes clear the aligned block of memory which rt points into. */ /* Writes clear the aligned block of memory which rt points into. */
if (s->mte_active[0]) { if (s->mte_active[0]) {