Selaa lähdekoodia

ARM: ux500: convert logical CPU numbers to physical numbers

This patch uses the new cpu_logical_map() macro for converting logical
CPU numbers into physical numbers when dealing with the pen_release
variable in the SMP boot and CPU hotplug paths.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Will Deacon 14 vuotta sitten
vanhempi
commit
28763487b1
2 muutettua tiedostoa jossa 2 lisäystä ja 2 poistoa
  1. 1 1
      arch/arm/mach-ux500/hotplug.c
  2. 1 1
      arch/arm/mach-ux500/platsmp.c

+ 1 - 1
arch/arm/mach-ux500/hotplug.c

@@ -24,7 +24,7 @@ static inline void platform_do_lowpower(unsigned int cpu)
 	for (;;) {
 		__asm__ __volatile__("dsb\n\t" "wfi\n\t"
 				: : : "memory");
-		if (pen_release == cpu) {
+		if (pen_release == cpu_logical_map(cpu)) {
 			/*
 			 * OK, proper wakeup, we're done
 			 */

+ 1 - 1
arch/arm/mach-ux500/platsmp.c

@@ -96,7 +96,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
 	 * the holding pen - release it, then wait for it to flag
 	 * that it has been released by resetting pen_release.
 	 */
-	write_pen_release(cpu);
+	write_pen_release(cpu_logical_map(cpu));
 
 	gic_raise_softirq(cpumask_of(cpu), 1);