From 7eaee7f73e798438a9630c502da19e61f1bfe34e Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Thu, 23 Oct 2025 13:12:50 +0100 Subject: [PATCH] target/arm: Honor param.aie in get_phys_addr_lpae Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20251014195017.421681-7-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/ptw.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 5fcf104272..23f6616811 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -2319,7 +2319,9 @@ static bool get_phys_addr_lpae(CPUARMState *env, S1Translate *ptw, /* Index into MAIR registers for cache attributes */ attrindx = extract32(attrs, 2, 3); - mair = env->cp15.mair_el[el]; + mair = (param.aie && extract64(attrs, 59, 1) + ? env->cp15.mair2_el[el] + : env->cp15.mair_el[el]); result->cacheattrs.is_s2_format = false; result->cacheattrs.attrs = extract64(mair, attrindx * 8, 8); -- 2.47.3