From 62ddaba69f1b4647ea387375cf18dda15e3602a8 Mon Sep 17 00:00:00 2001 From: Peter Crosthwaite Date: Tue, 13 Feb 2018 14:37:01 -0500 Subject: [PATCH] arm: Don't add v7mp registers in MPU systems These registers are VMSA specific so they should be conditional on VMSA (i.e. !MPU). Backports commit 5e5cf9e35f25f9f932a6ce25107c11b67b426a43 from qemu --- qemu/target-arm/helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qemu/target-arm/helper.c b/qemu/target-arm/helper.c index c53262f4..06fde6ac 100644 --- a/qemu/target-arm/helper.c +++ b/qemu/target-arm/helper.c @@ -2746,7 +2746,8 @@ void register_cp_regs_for_features(ARMCPU *cpu) if (arm_feature(env, ARM_FEATURE_V6K)) { define_arm_cp_regs(cpu, v6k_cp_reginfo); } - if (arm_feature(env, ARM_FEATURE_V7MP)) { + if (arm_feature(env, ARM_FEATURE_V7MP) && + !arm_feature(env, ARM_FEATURE_MPU)) { define_arm_cp_regs(cpu, v7mp_cp_reginfo); } if (arm_feature(env, ARM_FEATURE_V7)) {