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
This commit is contained in:
Mathew Maidment 2018-05-08 08:27:31 -04:00 committed by Lioncash
parent 5940a36394
commit 06da6ae3c8
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7

View file

@ -4641,7 +4641,7 @@ void register_cp_regs_for_features(ARMCPU *cpu)
for (r = id_cp_reginfo; r->type != ARM_CP_SENTINEL; r++) { for (r = id_cp_reginfo; r->type != ARM_CP_SENTINEL; r++) {
r->access = PL1_RW; r->access = PL1_RW;
} }
id_tlbtr_reginfo.access = PL1_RW; id_mpuir_reginfo.access = PL1_RW;
id_tlbtr_reginfo.access = PL1_RW; id_tlbtr_reginfo.access = PL1_RW;
} }
if (arm_feature(env, ARM_FEATURE_V8)) { if (arm_feature(env, ARM_FEATURE_V8)) {