On 5/21/25 20:02, Oliver Upton wrote:
Using an EL2 that enables SCXTNUM_ELx for guests while disabling the feature for the host generates erroneous traps to EL2 when running under TCG.Fix the issue by only evaluating SCTLR_EL2.EnSCXT when ELIsInHost(). Signed-off-by: Oliver Upton <oliver.up...@linux.dev> --- target/arm/helper.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 7631210287..83d4236417 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -7389,16 +7389,16 @@ static CPAccessResult access_scxtnum(CPUARMState *env, const ARMCPRegInfo *ri, { uint64_t hcr = arm_hcr_el2_eff(env); int el = arm_current_el(env); + uint64_t sctlr;- if (el == 0 && !((hcr & HCR_E2H) && (hcr & HCR_TGE))) {- if (env->cp15.sctlr_el[1] & SCTLR_TSCXT) { - if (hcr & HCR_TGE) { - return CP_ACCESS_TRAP_EL2; - } - return CP_ACCESS_TRAP_EL1; + sctlr = el_is_in_host(env, el) ? env->cp15.sctlr_el[2] : + env->cp15.sctlr_el[1];
Use arm_sctlr() instead. r~
