| Message ID | 1299566250-10516-16-git-send-email-benh@kernel.crashing.org (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Tue, 2011-03-08 at 17:37 +1100, Benjamin Herrenschmidt wrote: > Instead, keep it static, expose an accessor and use that from > the PowerMac code. Avoids easy namespace collisions and will > make it easier to consolidate with other implementations. > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > --- > arch/powerpc/include/asm/smp.h | 2 +- > arch/powerpc/kernel/smp.c | 7 ++++++- > arch/powerpc/platforms/powermac/smp.c | 12 ++++++++---- > 3 files changed, 15 insertions(+), 6 deletions(-) > > diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h > index 7e99771..a902a0d 100644 > --- a/arch/powerpc/include/asm/smp.h > +++ b/arch/powerpc/include/asm/smp.h > @@ -45,7 +45,7 @@ extern void migrate_irqs(void); > int generic_cpu_disable(void); > void generic_cpu_die(unsigned int cpu); > void generic_mach_cpu_die(void); > -DECLARE_PER_CPU(int, cpu_state); > +void generic_set_cpu_dead(unsigned int cpu); Takes a cpu parameter .. > +void generic_set_cpu_dead(unsigned int cpu) > +{ > + __get_cpu_var(cpu_state) = CPU_DEAD; > +} But doesn't use it. cheers
On Tue, 2011-03-29 at 16:37 +1100, Michael Ellerman wrote: > Takes a cpu parameter .. > > > +void generic_set_cpu_dead(unsigned int cpu) > > +{ > > + __get_cpu_var(cpu_state) = CPU_DEAD; > > +} > > But doesn't use it. Yeah that's a bug. Fortunately it's always called on the current CPU :-) I'll fix it tho. Thanks, Ben.
diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h index 7e99771..a902a0d 100644 --- a/arch/powerpc/include/asm/smp.h +++ b/arch/powerpc/include/asm/smp.h @@ -45,7 +45,7 @@ extern void migrate_irqs(void); int generic_cpu_disable(void); void generic_cpu_die(unsigned int cpu); void generic_mach_cpu_die(void); -DECLARE_PER_CPU(int, cpu_state); +void generic_set_cpu_dead(unsigned int cpu); #endif #ifdef CONFIG_PPC64 diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c index df37397..7beb001 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c @@ -305,7 +305,7 @@ void __devinit smp_prepare_boot_cpu(void) #ifdef CONFIG_HOTPLUG_CPU /* State of each CPU during hotplug phases */ -DEFINE_PER_CPU(int, cpu_state) = { 0 }; +static DEFINE_PER_CPU(int, cpu_state) = { 0 }; int generic_cpu_disable(void) { @@ -348,6 +348,11 @@ void generic_mach_cpu_die(void) while (__get_cpu_var(cpu_state) != CPU_UP_PREPARE) cpu_relax(); } + +void generic_set_cpu_dead(unsigned int cpu) +{ + __get_cpu_var(cpu_state) = CPU_DEAD; +} #endif int __cpuinit __cpu_up(unsigned int cpu) diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c index 74a43c6..ce5b4f5 100644 --- a/arch/powerpc/platforms/powermac/smp.c +++ b/arch/powerpc/platforms/powermac/smp.c @@ -920,10 +920,12 @@ static int smp_core99_cpu_disable(void) static void pmac_cpu_die(void) { + int cpu = smp_processor_id(); + local_irq_disable(); idle_task_exit(); - printk(KERN_DEBUG "CPU%d offline\n", smp_processor_id()); - __get_cpu_var(cpu_state) = CPU_DEAD; + pr_debug("CPU%d offline\n", cpu); + generic_set_cpu_dead(cpu); smp_wmb(); mb(); low_cpu_die(); @@ -933,6 +935,8 @@ static void pmac_cpu_die(void) static void pmac_cpu_die(void) { + int cpu = smp_processor_id(); + local_irq_disable(); idle_task_exit(); @@ -942,8 +946,8 @@ static void pmac_cpu_die(void) * on core99 platforms for now ... */ - printk(KERN_INFO "CPU#%d offline\n", smp_processor_id()); - __get_cpu_var(cpu_state) = CPU_DEAD; + printk(KERN_INFO "CPU#%d offline\n", cpu); + generic_set_cpu_dead(cpu); smp_wmb(); /*
Instead, keep it static, expose an accessor and use that from the PowerMac code. Avoids easy namespace collisions and will make it easier to consolidate with other implementations. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> --- arch/powerpc/include/asm/smp.h | 2 +- arch/powerpc/kernel/smp.c | 7 ++++++- arch/powerpc/platforms/powermac/smp.c | 12 ++++++++---- 3 files changed, 15 insertions(+), 6 deletions(-)