diff options
| author | Julien Grall <julien.grall@linaro.org> | 2013-08-30 14:30:27 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2013-09-09 14:44:26 +0100 |
| commit | 8529ac933e82a900f86a71b58a338461d6027298 (patch) | |
| tree | eb389d4de2041abee515ea061496ecde3f628e28 /xen | |
| parent | 8e4610ec55751c3d1a4f515ba4041ca6faa16d15 (diff) | |
| download | xen-8529ac933e82a900f86a71b58a338461d6027298.tar.gz xen-8529ac933e82a900f86a71b58a338461d6027298.tar.bz2 xen-8529ac933e82a900f86a71b58a338461d6027298.zip | |
xen/arm: Introduce MPIDR_HWID_MASK
This define will be use later to retrieve the correct hardware CPU ID.
Also replace hardcoded mask in arm32/head.S by this define.
Signed-off-by: Julien Grall <julien.grall@linaro.org>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'xen')
| -rw-r--r-- | xen/arch/arm/arm32/head.S | 2 | ||||
| -rw-r--r-- | xen/include/asm-arm/processor.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index b8334e2d74..79e95b673c 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -98,7 +98,7 @@ past_zImage: beq boot_cpu tst r0, #(1<<30) /* Uniprocessor system? */ bne boot_cpu - bics r12, r0, #(0xff << 24) /* Mask out flags to get CPU ID */ + bics r12, r0, #(~MPIDR_HWID_MASK) /* Mask out flags to get CPU ID */ beq boot_cpu /* If we're CPU 0, boot now */ /* Non-boot CPUs wait here to be woken up one at a time. */ diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 1a4f8d17da..808567e5df 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -12,6 +12,7 @@ #define MPIDR_SMP (1 << 31) #define MPIDR_AFF0_SHIFT (0) #define MPIDR_AFF0_MASK (0xff << MPIDR_AFF0_SHIFT) +#define MPIDR_HWID_MASK 0xffffff /* TTBCR Translation Table Base Control Register */ #define TTBCR_EAE 0x80000000 |