Patchwork target-arm: Make LPAE feature imply V7MP

login
register
mail settings
Submitter Peter Maydell
Date June 13, 2013, 12:51 p.m.
Message ID <1371127899-10364-1-git-send-email-peter.maydell@linaro.org>
Download mbox | patch
Permalink /patch/251066/
State New
Headers show

Comments

Peter Maydell - June 13, 2013, 12:51 p.m.
The v7 ARM ARM specifies that the Large Physical Address
Extension requires implementation of the Multiprocessing
Extensions, so make our LPAE feature imply V7MP rather
than specifying both in the A15 CPU initfn.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
Doesn't make much difference now, but will save a line when
adding future CPU definitions.

 target-arm/cpu.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Andreas Färber - June 13, 2013, 1:12 p.m.
Am 13.06.2013 14:51, schrieb Peter Maydell:
> The v7 ARM ARM specifies that the Large Physical Address
> Extension requires implementation of the Multiprocessing
> Extensions, so make our LPAE feature imply V7MP rather
> than specifying both in the A15 CPU initfn.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> Doesn't make much difference now, but will save a line when
> adding future CPU definitions.

Looks sensible,

Reviewed-by: Andreas Färber <afaerber@suse.de>

Andreas

Patch

diff --git a/target-arm/cpu.c b/target-arm/cpu.c
index 496a59f..54b4bb2 100644
--- a/target-arm/cpu.c
+++ b/target-arm/cpu.c
@@ -198,6 +198,7 @@  static void arm_cpu_realizefn(DeviceState *dev, Error **errp)
         set_feature(env, ARM_FEATURE_VFP);
     }
     if (arm_feature(env, ARM_FEATURE_LPAE)) {
+        set_feature(env, ARM_FEATURE_V7MP);
         set_feature(env, ARM_FEATURE_PXN);
     }
 
@@ -571,7 +572,6 @@  static void cortex_a15_initfn(Object *obj)
     set_feature(&cpu->env, ARM_FEATURE_NEON);
     set_feature(&cpu->env, ARM_FEATURE_THUMB2EE);
     set_feature(&cpu->env, ARM_FEATURE_ARM_DIV);
-    set_feature(&cpu->env, ARM_FEATURE_V7MP);
     set_feature(&cpu->env, ARM_FEATURE_GENERIC_TIMER);
     set_feature(&cpu->env, ARM_FEATURE_DUMMY_C15_REGS);
     set_feature(&cpu->env, ARM_FEATURE_LPAE);