From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-arm@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Subject: [PATCH v2 6/7] target/arm: Honor param.aie in get_phys_addr_lpae
Date: Tue, 14 Oct 2025 12:50:16 -0700 [thread overview]
Message-ID: <20251014195017.421681-7-richard.henderson@linaro.org> (raw)
In-Reply-To: <20251014195017.421681-1-richard.henderson@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
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.43.0
next prev parent reply other threads:[~2025-10-14 19:51 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-14 19:50 [PATCH v2 0/7] target/arm: Implement FEAT_AIE Richard Henderson
2025-10-14 19:50 ` [PATCH v2 1/7] target/arm: Add isar feature test for FEAT_AIE Richard Henderson
2025-10-14 19:50 ` [PATCH v2 2/7] target/arm: Implement MAIR2_ELx and AMAIR2_ELx Richard Henderson
2025-10-14 19:50 ` [PATCH v2 3/7] target/arm: Add AIE to ARMVAParameters Richard Henderson
2025-10-14 19:50 ` [PATCH v2 4/7] target/arm: Drop trivial assert vs attrindx Richard Henderson
2025-10-14 19:50 ` [PATCH v2 5/7] target/arm: Use el local indexing mair_el Richard Henderson
2025-10-14 19:50 ` Richard Henderson [this message]
2025-10-14 19:50 ` [PATCH v2 7/7] target/arm: Enable FEAT_AIE for -cpu max Richard Henderson
2025-10-16 9:42 ` [PATCH v2 0/7] target/arm: Implement FEAT_AIE Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251014195017.421681-7-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).