diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2013-01-31 19:28:42 (GMT) |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2013-01-31 19:54:30 (GMT) |
| commit | 63fc1370c19052fa5bec9593557431efc7ecc9fe (patch) | |
| tree | 9ca7a80d3ae04ae9d0c4f166eb15d57eb6f4d268 /arch/arm/mach-highbank/sysregs.h | |
| parent | c7d5b93e9834f0e6cf21828a6fbf45ac440cf364 (diff) | |
| download | linux-fsl-qoriq-63fc1370c19052fa5bec9593557431efc7ecc9fe.tar.xz | |
ARM: highbank: mask cluster id from cpu_logical_map
With commit a0ae0240 (ARM: kernel: add device tree init map function),
the cpu id value may include the cluster id and is no longer 0-3, so we
need to mask it now to get the right hard cpu index.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Diffstat (limited to 'arch/arm/mach-highbank/sysregs.h')
| -rw-r--r-- | arch/arm/mach-highbank/sysregs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-highbank/sysregs.h b/arch/arm/mach-highbank/sysregs.h index 70af9d1..5995df7 100644 --- a/arch/arm/mach-highbank/sysregs.h +++ b/arch/arm/mach-highbank/sysregs.h @@ -37,7 +37,7 @@ extern void __iomem *sregs_base; static inline void highbank_set_core_pwr(void) { - int cpu = cpu_logical_map(smp_processor_id()); + int cpu = MPIDR_AFFINITY_LEVEL(cpu_logical_map(smp_processor_id()), 0); if (scu_base_addr) scu_power_mode(scu_base_addr, SCU_PM_POWEROFF); else @@ -46,7 +46,7 @@ static inline void highbank_set_core_pwr(void) static inline void highbank_clear_core_pwr(void) { - int cpu = cpu_logical_map(smp_processor_id()); + int cpu = MPIDR_AFFINITY_LEVEL(cpu_logical_map(smp_processor_id()), 0); if (scu_base_addr) scu_power_mode(scu_base_addr, SCU_PM_NORMAL); else |