diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-04-11 17:24:57 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-04-11 17:32:15 +0100 |
| commit | 0059aa2df62d516d0d550b8bce2ddb3d48a9d38a (patch) | |
| tree | 35ccdd9d4f09253ab9c7170e8ac2b44f70efca86 | |
| parent | 27bae8f0e183f27c60c39bea6afa1ba7a35e0e7b (diff) | |
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.)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | target/arm/cpu.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 8e57498a1e..df8b835a87 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -543,6 +543,14 @@ static void arm_cpu_post_init(Object *obj) { ARMCPU *cpu = ARM_CPU(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, |