[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 1/7] target/arm: Don't add all MIDR aliases for cores that imp
From: |
tobias.roehmel |
Subject: |
[PATCH v6 1/7] target/arm: Don't add all MIDR aliases for cores that implement PMSA |
Date: |
Tue, 6 Dec 2022 11:24:58 +0100 |
From: Tobias Röhmel <tobias.roehmel@rwth-aachen.de>
Cores with PMSA have the MPUIR register which has the
same encoding as the MIDR alias with opc2=4. So we only
add that alias if we are not realizing a core that
implements PMSA.
Signed-off-by: Tobias Röhmel <tobias.roehmel@rwth-aachen.de>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
target/arm/helper.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index d8c8223ec3..d857d61fa9 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -8112,10 +8112,7 @@ void register_cp_regs_for_features(ARMCPU *cpu)
.access = PL1_R, .type = ARM_CP_NO_RAW, .resetvalue = cpu->midr,
.fieldoffset = offsetof(CPUARMState, cp15.c0_cpuid),
.readfn = midr_read },
- /* crn = 0 op1 = 0 crm = 0 op2 = 4,7 : AArch32 aliases of MIDR */
- { .name = "MIDR", .type = ARM_CP_ALIAS | ARM_CP_CONST,
- .cp = 15, .crn = 0, .crm = 0, .opc1 = 0, .opc2 = 4,
- .access = PL1_R, .resetvalue = cpu->midr },
+ /* crn = 0 op1 = 0 crm = 0 op2 = 7 : AArch32 aliases of MIDR */
{ .name = "MIDR", .type = ARM_CP_ALIAS | ARM_CP_CONST,
.cp = 15, .crn = 0, .crm = 0, .opc1 = 0, .opc2 = 7,
.access = PL1_R, .resetvalue = cpu->midr },
@@ -8125,6 +8122,11 @@ void register_cp_regs_for_features(ARMCPU *cpu)
.accessfn = access_aa64_tid1,
.type = ARM_CP_CONST, .resetvalue = cpu->revidr },
};
+ ARMCPRegInfo id_v8_midr_alias_cp_reginfo = {
+ .name = "MIDR", .type = ARM_CP_ALIAS | ARM_CP_CONST,
+ .cp = 15, .crn = 0, .crm = 0, .opc1 = 0, .opc2 = 4,
+ .access = PL1_R, .resetvalue = cpu->midr
+ };
ARMCPRegInfo id_cp_reginfo[] = {
/* These are common to v8 and pre-v8 */
{ .name = "CTR",
@@ -8190,6 +8192,9 @@ void register_cp_regs_for_features(ARMCPU *cpu)
}
if (arm_feature(env, ARM_FEATURE_V8)) {
define_arm_cp_regs(cpu, id_v8_midr_cp_reginfo);
+ if (!arm_feature(env, ARM_FEATURE_PMSA)) {
+ define_one_arm_cp_reg(cpu, &id_v8_midr_alias_cp_reginfo);
+ }
} else {
define_arm_cp_regs(cpu, id_pre_v8_midr_cp_reginfo);
}
--
2.34.1
- [PATCH v6 0/7] Add ARM Cortex-R52 CPU, tobias.roehmel, 2022/12/06
- [PATCH v6 7/7] target/arm: Add ARM Cortex-R52 CPU, tobias.roehmel, 2022/12/06
- [PATCH v6 2/7] target/arm: Make RVBAR available for all ARMv8 CPUs, tobias.roehmel, 2022/12/06
- [PATCH v6 1/7] target/arm: Don't add all MIDR aliases for cores that implement PMSA,
tobias.roehmel <=
- [PATCH v6 3/7] target/arm: Make stage_2_format for cache attributes optional, tobias.roehmel, 2022/12/06
- [PATCH v6 5/7] target/arm: Add PMSAv8r registers, tobias.roehmel, 2022/12/06
- [PATCH v6 4/7] target/arm: Enable TTBCR_EAE for ARMv8-R AArch32, tobias.roehmel, 2022/12/06
- [PATCH v6 6/7] target/arm: Add PMSAv8r functionality, tobias.roehmel, 2022/12/06
- Re: [PATCH v6 0/7] Add ARM Cortex-R52 CPU, Philippe Mathieu-Daudé, 2022/12/06
- Re: [PATCH v6 0/7] Add ARM Cortex-R52 CPU, Peter Maydell, 2022/12/19