Commit c7d5b93e authored Jan 31, 2013 by Rob Herring

ARM: scu: 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 in scu_power_mode to get the local cpu number. Since we
are only dealing with the cpu we are running on, the cluster id should
not ever be needed.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>

parent eed88123

arch/arm/kernel/smp_scu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ void scu_enable(void __iomem *scu_base)
		int scu_power_mode(void __iomem *scu_base, unsigned int mode)
		{
		unsigned int val;
		int cpu = cpu_logical_map(smp_processor_id());
		int cpu = MPIDR_AFFINITY_LEVEL(cpu_logical_map(smp_processor_id()), 0);

		if (mode > 3 \|\| mode == 1 \|\| cpu > 3)
		return -EINVAL;