summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorMathew Maidment <mathew1800@gmail.com>2018-05-04 18:05:50 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-05-04 18:05:50 +0100
commit100061121c1f69a672ce7bb3e9e3781f8018f9f6 (patch)
tree801936c6f390c722bd06e39760a52afbfe32f3cf /target
parent6d9c1b8dbb3527258bbc473aa3a9b02c6a86c506 (diff)
downloadqemu-100061121c1f69a672ce7bb3e9e3781f8018f9f6.tar.gz
target/arm: Correct MPUIR privilege level in register_cp_regs_for_features() conditional case
The duplication of id_tlbtr_reginfo was unintentionally added within 3281af8114c6b8ead02f08b58e3c36895c1ea047 which should have been id_mpuir_reginfo. The effect was that for OMAP and StrongARM CPUs we would incorrectly UNDEF writes to MPUIR rather than NOPing them. Signed-off-by: Mathew Maidment <mathew1800@gmail.com> Message-id: 20180501184933.37609-2-mathew1800@gmail.com [PMM: tweak commit message] Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target')
-rw-r--r--target/arm/helper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/arm/helper.c b/target/arm/helper.c
index 52a88e0297..0fef5d4d06 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -5347,7 +5347,7 @@ void register_cp_regs_for_features(ARMCPU *cpu)
for (r = id_cp_reginfo; r->type != ARM_CP_SENTINEL; r++) {
r->access = PL1_RW;
}
- id_tlbtr_reginfo.access = PL1_RW;
+ id_mpuir_reginfo.access = PL1_RW;
id_tlbtr_reginfo.access = PL1_RW;
}
if (arm_feature(env, ARM_FEATURE_V8)) {