From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>, qemu-arm@nongnu.org
Subject: [PATCH v2 02/24] target/arm: Adjust definition of CONTEXTIDR_EL2
Date: Mon, 11 Apr 2022 17:33:04 -0700 [thread overview]
Message-ID: <20220412003326.588530-3-richard.henderson@linaro.org> (raw)
In-Reply-To: <20220412003326.588530-1-richard.henderson@linaro.org>
This register is present for either VHE or Debugv8p2, and is
RES0 from EL3 when EL2 is not present. Move the definition
out of vhe_reginfo and provide a fallback for missing EL2.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/arm/helper.c | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index 7d14650615..210c139818 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -7443,11 +7443,20 @@ static const ARMCPRegInfo jazelle_regs[] = {
REGINFO_SENTINEL
};
+static const ARMCPRegInfo contextidr_el2 = {
+ .name = "CONTEXTIDR_EL2", .state = ARM_CP_STATE_AA64,
+ .opc0 = 3, .opc1 = 4, .crn = 13, .crm = 0, .opc2 = 1,
+ .access = PL2_RW,
+ .fieldoffset = offsetof(CPUARMState, cp15.contextidr_el[2])
+};
+
+static const ARMCPRegInfo contextidr_no_el2 = {
+ .name = "CONTEXTIDR_EL2", .state = ARM_CP_STATE_AA64,
+ .opc0 = 3, .opc1 = 4, .crn = 13, .crm = 0, .opc2 = 1,
+ .access = PL2_RW, .type = ARM_CP_CONST, .resetvalue = 0
+};
+
static const ARMCPRegInfo vhe_reginfo[] = {
- { .name = "CONTEXTIDR_EL2", .state = ARM_CP_STATE_AA64,
- .opc0 = 3, .opc1 = 4, .crn = 13, .crm = 0, .opc2 = 1,
- .access = PL2_RW,
- .fieldoffset = offsetof(CPUARMState, cp15.contextidr_el[2]) },
{ .name = "TTBR1_EL2", .state = ARM_CP_STATE_AA64,
.opc0 = 3, .opc1 = 4, .crn = 2, .crm = 0, .opc2 = 1,
.access = PL2_RW, .writefn = vmsa_tcr_ttbr_el2_write,
@@ -8443,6 +8452,14 @@ void register_cp_regs_for_features(ARMCPU *cpu)
define_one_arm_cp_reg(cpu, &ssbs_reginfo);
}
+ if (cpu_isar_feature(aa64_vh, cpu) ||
+ cpu_isar_feature(aa64_debugv8p2, cpu)) {
+ if (arm_feature(env, ARM_FEATURE_EL2)) {
+ define_one_arm_cp_reg(cpu, &contextidr_el2);
+ } else {
+ define_one_arm_cp_reg(cpu, &contextidr_no_el2);
+ }
+ }
if (arm_feature(env, ARM_FEATURE_EL2) && cpu_isar_feature(aa64_vh, cpu)) {
define_arm_cp_regs(cpu, vhe_reginfo);
}
--
2.25.1
next prev parent reply other threads:[~2022-04-12 0:37 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-12 0:33 [PATCH v2 00/24] target/arm: 8 new features, A76 and N1 Richard Henderson
2022-04-12 0:33 ` [PATCH v2 01/24] target/arm: Add isar predicates for FEAT_Debugv8p2 Richard Henderson
2022-04-12 0:33 ` Richard Henderson [this message]
2022-04-12 0:33 ` [PATCH v2 03/24] target/arm: Move cortex impdef sysregs to cpu_tcg.c Richard Henderson
2022-04-12 0:33 ` [PATCH v2 04/24] target/arm: Update qemu-system-arm -cpu max to cortex-a57 Richard Henderson
2022-04-12 0:33 ` [PATCH v2 05/24] target/arm: Set ID_DFR0.PerfMon for qemu-system-arm -cpu max Richard Henderson
2022-04-12 0:33 ` [PATCH v2 06/24] target/arm: Split out arm32_max_features Richard Henderson
2022-04-12 0:33 ` [PATCH v2 07/24] target/arm: Annotate arm_max_initfn with FEAT identifiers Richard Henderson
2022-04-12 0:33 ` [PATCH v2 08/24] target/arm: Use field names for manipulating EL2 and EL3 modes Richard Henderson
2022-04-12 0:33 ` [PATCH v2 09/24] target/arm: Enable FEAT_Debugv8p2 for -cpu max Richard Henderson
2022-04-12 0:33 ` [PATCH v2 10/24] target/arm: Enable FEAT_Debugv8p4 " Richard Henderson
2022-04-12 0:33 ` [PATCH v2 11/24] target/arm: Add isar_feature_{aa64,any}_ras Richard Henderson
2022-04-12 0:33 ` [PATCH v2 12/24] target/arm: Add minimal RAS registers Richard Henderson
2022-04-12 0:33 ` [PATCH v2 13/24] target/arm: Enable SCR and HCR bits for RAS Richard Henderson
2022-04-12 0:33 ` [PATCH v2 14/24] target/arm: Implement virtual SError exceptions Richard Henderson
2022-04-12 0:33 ` [PATCH v2 15/24] target/arm: Implement ESB instruction Richard Henderson
2022-04-12 0:33 ` [PATCH v2 16/24] target/arm: Enable FEAT_RAS for -cpu max Richard Henderson
2022-04-12 0:33 ` [PATCH v2 17/24] target/arm: Enable FEAT_IESB " Richard Henderson
2022-04-12 0:33 ` [PATCH v2 18/24] target/arm: Enable FEAT_CSV2 " Richard Henderson
2022-04-12 0:33 ` [PATCH v2 19/24] target/arm: Update ISAR fields for ARMv8.8 Richard Henderson
2022-04-12 0:33 ` [PATCH v2 20/24] target/arm: Enable FEAT_CSV2_2 for -cpu max Richard Henderson
2022-04-12 0:33 ` [PATCH v2 21/24] target/arm: Enable FEAT_CSV3 " Richard Henderson
2022-04-12 0:33 ` [PATCH v2 22/24] target/arm: Enable FEAT_DGH " Richard Henderson
2022-04-12 0:33 ` [PATCH v2 23/24] target/arm: Define cortex-a76 Richard Henderson
2022-04-12 0:33 ` [PATCH v2 24/24] target/arm: Define neoverse-n1 Richard Henderson
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=20220412003326.588530-3-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).