8264dde537
Building with CONFIG_HOTPLUG_CPU disabled fails for mach-tango: include/linux/stddef.h:7:14: error: excess elements in struct initializer [-Werror] #define NULL ((void *)0) arch/arm/mach-tango/platsmp.c:48:15: note: in expansion of macro 'tango_cpu_kill' .cpu_kill = tango_cpu_kill, the problem as that the .cpu_kill and .cpu_die struct members are unavailable and we must not try to assign them in this configuration. Hiding the two (as all other platforms do too) lets us get rid of the #else clause as well. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Olof Johansson <olof@lixom.net>
52 lines
1.1 KiB
C
52 lines
1.1 KiB
C
#include <linux/delay.h>
|
|
#include <linux/init.h>
|
|
#include <linux/smp.h>
|
|
#include "smc.h"
|
|
|
|
static int tango_boot_secondary(unsigned int cpu, struct task_struct *idle)
|
|
{
|
|
tango_set_aux_boot_addr(virt_to_phys(secondary_startup));
|
|
tango_start_aux_core(cpu);
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
/*
|
|
* cpu_kill() and cpu_die() run concurrently on different cores.
|
|
* Firmware will only "kill" a core once it has properly "died".
|
|
* Try a few times to kill a core before giving up, and sleep
|
|
* between tries to give that core enough time to die.
|
|
*/
|
|
static int tango_cpu_kill(unsigned int cpu)
|
|
{
|
|
int i, err;
|
|
|
|
for (i = 0; i < 10; ++i) {
|
|
msleep(10);
|
|
err = tango_aux_core_kill(cpu);
|
|
if (!err)
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
static void tango_cpu_die(unsigned int cpu)
|
|
{
|
|
while (tango_aux_core_die(cpu) < 0)
|
|
cpu_relax();
|
|
|
|
panic("cpu %d failed to die\n", cpu);
|
|
}
|
|
#endif
|
|
|
|
static const struct smp_operations tango_smp_ops __initconst = {
|
|
.smp_boot_secondary = tango_boot_secondary,
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
.cpu_kill = tango_cpu_kill,
|
|
.cpu_die = tango_cpu_die,
|
|
#endif
|
|
};
|
|
|
|
CPU_METHOD_OF_DECLARE(tango4_smp, "sigma,tango4-smp", &tango_smp_ops);
|