diff options
author | Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com> | 2013-01-22 10:56:40 +0000 |
---|---|---|
committer | Pawel Moll <pawel.moll@arm.com> | 2013-01-24 12:19:23 +0000 |
commit | 1585defb4ceca98b12bd6fba6802c22e77e172bb (patch) | |
tree | f37374342c72114fc5e332d0c10bf49a9268da48 /arch | |
parent | 7d1f9aeff1ee4a20b1aeb377dd0f579fe9647619 (diff) | |
download | linux-3.10-1585defb4ceca98b12bd6fba6802c22e77e172bb.tar.gz linux-3.10-1585defb4ceca98b12bd6fba6802c22e77e172bb.tar.bz2 linux-3.10-1585defb4ceca98b12bd6fba6802c22e77e172bb.zip |
ARM: vexpress: extend the MPIDR range used for pen release check
In ARM multi-cluster systems the MPIDR affinity level 0 cannot be used as a
single cpu identifier, affinity levels 1 and 2 must be taken into account as
well.
This patch extends the MPIDR usage to affinity levels 1 and 2 in versatile
secondary cores start up code in order to compare the passed pen_release
value with the full-blown affinity mask.
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Liviu Dudau <liviu.dudau@arm.com>
Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/plat-versatile/headsmp.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-versatile/headsmp.S b/arch/arm/plat-versatile/headsmp.S index dd703ef09b8..b178d44e9ea 100644 --- a/arch/arm/plat-versatile/headsmp.S +++ b/arch/arm/plat-versatile/headsmp.S @@ -20,7 +20,7 @@ */ ENTRY(versatile_secondary_startup) mrc p15, 0, r0, c0, c0, 5 - and r0, r0, #15 + bic r0, #0xff000000 adr r4, 1f ldmia r4, {r5, r6} sub r4, r4, r5 |