Message ID | 20111117112852.9191.34256.stgit@localhost6.localdomain6 (mailing list archive) |
---|---|
State | Changes Requested |
Delegated to: | Benjamin Herrenschmidt |
Headers | show |
On Thu, 2011-11-17 at 16:58 +0530, Deepthi Dharwar wrote: > This patch enables cpuidle for pSeries and cpuidle_idle_call() is > directly called from the idle loop. As a result pseries_idle cpuidle > driver registered with cpuidle subsystem comes into action. This patch > also removes the routines pseries_shared_idle_sleep and > pseries_dedicated_idle_sleep as they are now implemented as part of > pseries_idle cpuidle driver. > > Signed-off-by: Deepthi Dharwar <deepthi@linux.vnet.ibm.com> > Signed-off-by: Trinabh Gupta <g.trinabh@gmail.com> > Signed-off-by: Arun R Bharadwaj <arun.r.bharadwaj@gmail.com> > --- > arch/powerpc/platforms/Kconfig | 6 ++ > arch/powerpc/platforms/pseries/setup.c | 86 +------------------------------- > include/linux/cpuidle.h | 2 - > 3 files changed, 8 insertions(+), 86 deletions(-) > > diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig > index e458872..0d2a028 100644 > --- a/arch/powerpc/platforms/Kconfig > +++ b/arch/powerpc/platforms/Kconfig > @@ -211,6 +211,12 @@ config PPC_PASEMI_CPUFREQ > > endmenu > > +menu "CPUIdle driver" > + > +source "drivers/cpuidle/Kconfig" > + > +endmenu > + > config PPC601_SYNC_FIX > bool "Workarounds for PPC601 bugs" > depends on 6xx && (PPC_PREP || PPC_PMAC) > diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c > index 9c6716a..f624e74 100644 > --- a/arch/powerpc/platforms/pseries/setup.c > +++ b/arch/powerpc/platforms/pseries/setup.c > @@ -39,6 +39,7 @@ > #include <linux/irq.h> > #include <linux/seq_file.h> > #include <linux/root_dev.h> > +#include <linux/cpuidle.h> > > #include <asm/mmu.h> > #include <asm/processor.h> > @@ -74,9 +75,6 @@ EXPORT_SYMBOL(CMO_PageSize); > > int fwnmi_active; /* TRUE if an FWNMI handler is present */ > > -static void pseries_shared_idle_sleep(void); > -static void pseries_dedicated_idle_sleep(void); > - > static struct device_node *pSeries_mpic_node; > > static void pSeries_show_cpuinfo(struct seq_file *m) > @@ -374,18 +372,9 @@ static void __init pSeries_setup_arch(void) > > pSeries_nvram_init(); > > - /* Choose an idle loop */ > if (firmware_has_feature(FW_FEATURE_SPLPAR)) { > vpa_init(boot_cpuid); > - if (get_lppaca()->shared_proc) { > - printk(KERN_DEBUG "Using shared processor idle loop\n"); > - ppc_md.power_save = pseries_shared_idle_sleep; > - } else { > - printk(KERN_DEBUG "Using dedicated idle loop\n"); > - ppc_md.power_save = pseries_dedicated_idle_sleep; > - } > - } else { > - printk(KERN_DEBUG "Using default idle loop\n"); > + ppc_md.power_save = (void *)cpuidle_idle_call; > } I very very much dislike that cast. You should not have to cast a function pointer ... EVER. > if (firmware_has_feature(FW_FEATURE_LPAR)) > @@ -586,77 +575,6 @@ static int __init pSeries_probe(void) > return 1; > } > Cheers, Ben.
On 11/28/2011 04:35 AM, Benjamin Herrenschmidt wrote: > On Thu, 2011-11-17 at 16:58 +0530, Deepthi Dharwar wrote: >> This patch enables cpuidle for pSeries and cpuidle_idle_call() is >> directly called from the idle loop. As a result pseries_idle cpuidle >> driver registered with cpuidle subsystem comes into action. This patch >> also removes the routines pseries_shared_idle_sleep and >> pseries_dedicated_idle_sleep as they are now implemented as part of >> pseries_idle cpuidle driver. >> >> Signed-off-by: Deepthi Dharwar <deepthi@linux.vnet.ibm.com> >> Signed-off-by: Trinabh Gupta <g.trinabh@gmail.com> >> Signed-off-by: Arun R Bharadwaj <arun.r.bharadwaj@gmail.com> >> --- >> arch/powerpc/platforms/Kconfig | 6 ++ >> arch/powerpc/platforms/pseries/setup.c | 86 +------------------------------- >> include/linux/cpuidle.h | 2 - >> 3 files changed, 8 insertions(+), 86 deletions(-) >> >> diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig >> index e458872..0d2a028 100644 >> --- a/arch/powerpc/platforms/Kconfig >> +++ b/arch/powerpc/platforms/Kconfig >> @@ -211,6 +211,12 @@ config PPC_PASEMI_CPUFREQ >> >> endmenu >> >> +menu "CPUIdle driver" >> + >> +source "drivers/cpuidle/Kconfig" >> + >> +endmenu >> + >> config PPC601_SYNC_FIX >> bool "Workarounds for PPC601 bugs" >> depends on 6xx && (PPC_PREP || PPC_PMAC) >> diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c >> index 9c6716a..f624e74 100644 >> --- a/arch/powerpc/platforms/pseries/setup.c >> +++ b/arch/powerpc/platforms/pseries/setup.c >> @@ -39,6 +39,7 @@ >> #include <linux/irq.h> >> #include <linux/seq_file.h> >> #include <linux/root_dev.h> >> +#include <linux/cpuidle.h> >> >> #include <asm/mmu.h> >> #include <asm/processor.h> >> @@ -74,9 +75,6 @@ EXPORT_SYMBOL(CMO_PageSize); >> >> int fwnmi_active; /* TRUE if an FWNMI handler is present */ >> >> -static void pseries_shared_idle_sleep(void); >> -static void pseries_dedicated_idle_sleep(void); >> - >> static struct device_node *pSeries_mpic_node; >> >> static void pSeries_show_cpuinfo(struct seq_file *m) >> @@ -374,18 +372,9 @@ static void __init pSeries_setup_arch(void) >> >> pSeries_nvram_init(); >> >> - /* Choose an idle loop */ >> if (firmware_has_feature(FW_FEATURE_SPLPAR)) { >> vpa_init(boot_cpuid); >> - if (get_lppaca()->shared_proc) { >> - printk(KERN_DEBUG "Using shared processor idle loop\n"); >> - ppc_md.power_save = pseries_shared_idle_sleep; >> - } else { >> - printk(KERN_DEBUG "Using dedicated idle loop\n"); >> - ppc_md.power_save = pseries_dedicated_idle_sleep; >> - } >> - } else { >> - printk(KERN_DEBUG "Using default idle loop\n"); >> + ppc_md.power_save = (void *)cpuidle_idle_call; >> } > > I very very much dislike that cast. You should not have to cast a > function pointer ... EVER. Yes, I ll fix this. This actually bought out a design flaw with the current pseries idle as mentioned by you in the next patch of the series. > >> if (firmware_has_feature(FW_FEATURE_LPAR)) >> @@ -586,77 +575,6 @@ static int __init pSeries_probe(void) >> return 1; >> } >> > > Cheers, > Ben. > > Regards, Deepthi
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig index e458872..0d2a028 100644 --- a/arch/powerpc/platforms/Kconfig +++ b/arch/powerpc/platforms/Kconfig @@ -211,6 +211,12 @@ config PPC_PASEMI_CPUFREQ endmenu +menu "CPUIdle driver" + +source "drivers/cpuidle/Kconfig" + +endmenu + config PPC601_SYNC_FIX bool "Workarounds for PPC601 bugs" depends on 6xx && (PPC_PREP || PPC_PMAC) diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index 9c6716a..f624e74 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c @@ -39,6 +39,7 @@ #include <linux/irq.h> #include <linux/seq_file.h> #include <linux/root_dev.h> +#include <linux/cpuidle.h> #include <asm/mmu.h> #include <asm/processor.h> @@ -74,9 +75,6 @@ EXPORT_SYMBOL(CMO_PageSize); int fwnmi_active; /* TRUE if an FWNMI handler is present */ -static void pseries_shared_idle_sleep(void); -static void pseries_dedicated_idle_sleep(void); - static struct device_node *pSeries_mpic_node; static void pSeries_show_cpuinfo(struct seq_file *m) @@ -374,18 +372,9 @@ static void __init pSeries_setup_arch(void) pSeries_nvram_init(); - /* Choose an idle loop */ if (firmware_has_feature(FW_FEATURE_SPLPAR)) { vpa_init(boot_cpuid); - if (get_lppaca()->shared_proc) { - printk(KERN_DEBUG "Using shared processor idle loop\n"); - ppc_md.power_save = pseries_shared_idle_sleep; - } else { - printk(KERN_DEBUG "Using dedicated idle loop\n"); - ppc_md.power_save = pseries_dedicated_idle_sleep; - } - } else { - printk(KERN_DEBUG "Using default idle loop\n"); + ppc_md.power_save = (void *)cpuidle_idle_call; } if (firmware_has_feature(FW_FEATURE_LPAR)) @@ -586,77 +575,6 @@ static int __init pSeries_probe(void) return 1; } -static void pseries_dedicated_idle_sleep(void) -{ - unsigned int cpu = smp_processor_id(); - unsigned long start_snooze; - unsigned long in_purr, out_purr; - long snooze = __get_cpu_var(smt_snooze_delay); - - /* - * Indicate to the HV that we are idle. Now would be - * a good time to find other work to dispatch. - */ - get_lppaca()->idle = 1; - get_lppaca()->donate_dedicated_cpu = 1; - in_purr = mfspr(SPRN_PURR); - - /* - * We come in with interrupts disabled, and need_resched() - * has been checked recently. If we should poll for a little - * while, do so. - */ - if (snooze) { - start_snooze = get_tb() + snooze * tb_ticks_per_usec; - local_irq_enable(); - set_thread_flag(TIF_POLLING_NRFLAG); - - while ((snooze < 0) || (get_tb() < start_snooze)) { - if (need_resched() || cpu_is_offline(cpu)) - goto out; - ppc64_runlatch_off(); - HMT_low(); - HMT_very_low(); - } - - HMT_medium(); - clear_thread_flag(TIF_POLLING_NRFLAG); - smp_mb(); - local_irq_disable(); - if (need_resched() || cpu_is_offline(cpu)) - goto out; - } - - cede_processor(); - -out: - HMT_medium(); - out_purr = mfspr(SPRN_PURR); - get_lppaca()->wait_state_cycles += out_purr - in_purr; - get_lppaca()->donate_dedicated_cpu = 0; - get_lppaca()->idle = 0; -} - -static void pseries_shared_idle_sleep(void) -{ - /* - * Indicate to the HV that we are idle. Now would be - * a good time to find other work to dispatch. - */ - get_lppaca()->idle = 1; - - /* - * Yield the processor to the hypervisor. We return if - * an external interrupt occurs (which are driven prior - * to returning here) or if a prod occurs from another - * processor. When returning here, external interrupts - * are enabled. - */ - cede_processor(); - - get_lppaca()->idle = 0; -} - static int pSeries_pci_probe_mode(struct pci_bus *bus) { if (firmware_has_feature(FW_FEATURE_LPAR)) diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 7408af8..23f81de 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -130,7 +130,6 @@ struct cpuidle_driver { #ifdef CONFIG_CPU_IDLE extern void disable_cpuidle(void); extern int cpuidle_idle_call(void); - extern int cpuidle_register_driver(struct cpuidle_driver *drv); struct cpuidle_driver *cpuidle_get_driver(void); extern void cpuidle_unregister_driver(struct cpuidle_driver *drv); @@ -145,7 +144,6 @@ extern void cpuidle_disable_device(struct cpuidle_device *dev); #else static inline void disable_cpuidle(void) { } static inline int cpuidle_idle_call(void) { return -ENODEV; } - static inline int cpuidle_register_driver(struct cpuidle_driver *drv) {return -ENODEV; } static inline struct cpuidle_driver *cpuidle_get_driver(void) {return NULL; }