leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc/smp: add generic_set_cpu_up() to set cpu_state as CPU_UP_PREPARE

Browse Source 
In the case of cpu hotplug, the cpu_state should be set to CPU_UP_PREPARE
when kicking cpu.  Otherwise, the cpu_state is always CPU_DEAD after
calling generic_set_cpu_dead(), which makes the delay in generic_cpu_die()
not happen.

Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Zhao Chenhui 2012-07-20 20:42:34 +08:00 committed by Kumar Gala
parent 15f34eb123
commit ae5cab4763
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/powerpc/include/asm/smp.h
View File

@ -65,6 +65,7 @@ int generic_cpu_disable(void);
void generic_cpu_die(unsigned int cpu); void generic_cpu_die(unsigned int cpu);
void generic_mach_cpu_die(void); void generic_mach_cpu_die(void);
void generic_set_cpu_dead(unsigned int cpu); void generic_set_cpu_dead(unsigned int cpu);
void generic_set_cpu_up(unsigned int cpu);
int generic_check_cpu_restart(unsigned int cpu); int generic_check_cpu_restart(unsigned int cpu);
#endif #endif

12
arch/powerpc/kernel/smp.c
View File

@ -102,7 +102,7 @@ int __devinit smp_generic_kick_cpu(int nr)
* Ok it's not there, so it might be soft-unplugged, let's * Ok it's not there, so it might be soft-unplugged, let's
* try to bring it back * try to bring it back
*/ */
per_cpu(cpu_state, nr) = CPU_UP_PREPARE; generic_set_cpu_up(nr);
smp_wmb(); smp_wmb();
smp_send_reschedule(nr); smp_send_reschedule(nr);
#endif /* CONFIG_HOTPLUG_CPU */ #endif /* CONFIG_HOTPLUG_CPU */
@ -413,6 +413,16 @@ void generic_set_cpu_dead(unsigned int cpu)
per_cpu(cpu_state, cpu) = CPU_DEAD; per_cpu(cpu_state, cpu) = CPU_DEAD;
} }
/*
* The cpu_state should be set to CPU_UP_PREPARE in kick_cpu(), otherwise
* the cpu_state is always CPU_DEAD after calling generic_set_cpu_dead(),
* which makes the delay in generic_cpu_die() not happen.
*/
void generic_set_cpu_up(unsigned int cpu)
{
per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
}
int generic_check_cpu_restart(unsigned int cpu) int generic_check_cpu_restart(unsigned int cpu)
{ {
return per_cpu(cpu_state, cpu) == CPU_UP_PREPARE; return per_cpu(cpu_state, cpu) == CPU_UP_PREPARE;