From 06da6ae3c81e4704abd47d662a1a9a49d860db65 Mon Sep 17 00:00:00 2001 From: Mathew Maidment Date: Tue, 8 May 2018 08:27:31 -0400 Subject: [PATCH] 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. Backports commit 100061121c1f69a672ce7bb3e9e3781f8018f9f6 from qemu --- qemu/target/arm/helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu/target/arm/helper.c b/qemu/target/arm/helper.c index 6b0536e2..e0433ff1 100644 --- a/qemu/target/arm/helper.c +++ b/qemu/target/arm/helper.c @@ -4641,7 +4641,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)) {