cpu hotplug in powermac g5
Subsystems (2)
RFC 1/1 cpu hotplug in powermac g5
The following patch seems to make cpu hotplugging mostly work on my quad powermac G5. The first part (platforms/powermac/smp.c) actually plugs in the right functions after which it already works, but the CPUs get warmer when offline than when online and idle.
The modification in powerpc/kernel/smp.c makes the generic cpu die routine also do more power saving just like the idle loop. I have no idea if it is correct.
There do seem to be some bugs with this, once a while I get a soft lockup detected but I can't figure out why/when it happened. Other than that, I can online/offline CPUs at will with this patch.
arch/powerpc/platforms/powermac/smp.c +8 -1
@@ -905,8 +905,15 @@ struct smp_ops_t core99_smp_ops = { .setup_cpu = smp_core99_setup_cpu, .give_timebase = smp_core99_give_timebase, .take_timebase = smp_core99_take_timebase, -#if defined(CONFIG_HOTPLUG_CPU ) && defined(CONFIG_PPC32 ) +#if defined(CONFIG_HOTPLUG_CPU ) +# if defined(CONFIG_PPC32 ) .cpu_disable = smp_core99_cpu_disable, .cpu_die = smp_core99_cpu_die, +# endif +# if defined(CONFIG_PPC64 ) + .cpu_disable = generic_cpu_disable, + .cpu_die = generic_cpu_die, + .cpu_enable = generic_cpu_enable, +# endif #endif };
arch/powerpc/kernel/smp.c +10 -2
@@ -441,8 +441,16 @@ void generic_mach_cpu_die(void)printk (KERN_DEBUG "CPU%d offline\n" , cpu);__get_cpu_var (cpu_state) =CPU_DEAD ;smp_wmb (); -while (__get_cpu_var (cpu_state) !=CPU_UP_PREPARE ) -cpu_relax (); +while (__get_cpu_var (cpu_state) !=CPU_UP_PREPARE ) { +if (ppc_md.power_save) { +/* need we do more? what about TIF_POLLING_NRFLAG? */ + ppc_md.power_save (); + }else { +HMT_low (); +HMT_very_low (); + } +HMT_medium ();/* should be after loop? */ + }#ifdef CONFIG_PPC64 flush_tlb_pending ();
RFC 1/1 cpu hotplug in powermac g5
Never mind the previous patch :) This one works much better.
Note that for software suspend, the generic cpu hotplug are not usable because they don't re-sync timebase etc. Hence, I here only use the generic die routines but the loop in which offline processors are is custom, and we use the regular CPU bring-up sequence instead of just exiting the loop.
---
This patch makes CPU hotplug work on my pm11,2. It works by reusing the normal smp_core99_kick_cpu routine for wakeup, and introducing a new routine that offline CPUs idle in, which is modeled after the idle loop but has no way out (except for taking the soft reset exception triggered by kick_cpu). This is required because the generic cpu hotplug code doesn't completely re-initialise the CPU when bringing it online again, which is required for software suspend.
arch/powerpc/platforms/powermac/smp.c +10 -2
@@ -895,7 +895,7 @@ cpu_dead[cpu] =0 ; } -#endif +#endif /* CONFIG_HOTPLUG_CPU && CONFIG_PP32 */ /* Core99 Macs (dual G4s and G5s) */ struct smp_ops_t core99_smp_ops = {
@@ -905,8 +905,16 @@ .setup_cpu = smp_core99_setup_cpu, .give_timebase = smp_core99_give_timebase, .take_timebase = smp_core99_take_timebase, -#if defined(CONFIG_HOTPLUG_CPU ) && defined(CONFIG_PPC32 ) +#if defined(CONFIG_HOTPLUG_CPU ) +# if defined(CONFIG_PPC32 ) .cpu_disable = smp_core99_cpu_disable, .cpu_die = smp_core99_cpu_die, +# endif +# if defined(CONFIG_PPC64 ) + .cpu_disable = generic_cpu_disable, + .cpu_die = generic_cpu_die, +/* intentionally do *NOT* assign cpu_enable, +* the generic code will use kick_cpu then! */ +# endif #endif };
arch/powerpc/platforms/powermac/setup.c +30 -1
@@ -492,6 +492,9 @@#ifdef CONFIG_SOFTWARE_SUSPEND pm_set_ops (&pmac_pm_ops);#endif /* CONFIG_SOFTWARE_SUSPEND */ +/* this is udbg (which is __init) and we can later use it during +* cpu hotplug (in smp_core99_kick_cpu) */ + ppc_md.progress =NULL ;return 0 ; }
@@ -728,6 +731,32 @@return PCI_PROBE_NORMAL ; return PCI_PROBE_DEVTREE; } + +#ifdef CONFIG_HOTPLUG_CPU +/* access per cpu vars from generic smp.c */ +DECLARE_PER_CPU (int, cpu_state); + +static void pmac_cpu_die (void ) +{ +/* turn off as much as possible, we'll be +* kicked out as this will only be invoked +* on core99 platforms for now ... */ +local_irq_disable (); +printk (KERN_DEBUG "CPU#%d offline\n" ,smp_processor_id ()); +__get_cpu_var (cpu_state) =CPU_DEAD ; +smp_wmb (); +while (1 ) { +ppc64_runlatch_off (); +if (ppc_md.power_save) { + ppc_md.power_save (); + }else { +HMT_low (); +HMT_very_low (); + } + } +} +#endif +#endif define_machine (powermac) {
@@ -766,6 +795,6 @@ .phys_mem_access_prot = pci_phys_mem_access_prot,#endif #if defined(CONFIG_HOTPLUG_CPU ) && defined(CONFIG_PPC64 ) - .cpu_die = generic_mach_cpu_die, + .cpu_die = pmac_cpu_die,#endif };