On Fri, 10 Oct 2025 at 21:21, Richard Henderson <[email protected]> wrote: > > Signed-off-by: Richard Henderson <[email protected]> > --- > 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);
Reviewed-by: Peter Maydell <[email protected]> thanks -- PMM
