From 9bc3050c5189d3ba1e4512769e045563680cd827 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Fri, 2 Mar 2018 19:26:33 -0500 Subject: [PATCH] arm: All M profile cores are PMSA All M profile CPUs are PMSA, so set the feature bit. (We haven't actually implemented the M profile MPU register interface yet, but setting this feature bit gives us closer to correct behaviour for the MPU-disabled case.) Backports commit 790a11503cfb5e1dcd031ea2212bbebae4ca3cec from qemu --- qemu/target/arm/cpu.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/qemu/target/arm/cpu.c b/qemu/target/arm/cpu.c index e7367f81..240b12e7 100644 --- a/qemu/target/arm/cpu.c +++ b/qemu/target/arm/cpu.c @@ -423,6 +423,14 @@ static void arm_cpu_post_init(struct uc_struct *uc, Object *obj) { ARMCPU *cpu = ARM_CPU(uc, obj); + /* M profile implies PMSA. We have to do this here rather than + * in realize with the other feature-implication checks because + * we look at the PMSA bit to see if we should add some properties. + */ + if (arm_feature(&cpu->env, ARM_FEATURE_M)) { + set_feature(&cpu->env, ARM_FEATURE_PMSA); + } + if (arm_feature(&cpu->env, ARM_FEATURE_CBAR) || arm_feature(&cpu->env, ARM_FEATURE_CBAR_RO)) { //qdev_property_add_static(DEVICE(obj), &arm_cpu_reset_cbar_property,