cpuidle: code consolidation
Subsystems (18)
v2 cover cpuidle: code consolidation
This patchset series provide some code consolidation across the different cpuidle drivers. It contains two parts, the first one is the removal of the time keeping flag and the second one, is a common initialization routine.
All the drivers use the en_core_tk_irqen flag, which means it is not necessary to make the time computation optional. We can remove this flag and assume the cpuidle framework always manage this operation.
The cpuidle code initialization is duplicated across the different drivers in the same manner.
The repeating pattern is:
SMP:
cpuidle_register_driver(drv);
for_each_possible_cpu(cpu) {
dev = per_cpu(cpuidle_device, cpu);
cpuidle_register_device(dev);
}UP:
cpuidle_register_driver(drv);cpuidle_register_device(dev);
As on a UP machine the macro 'for_each_cpu' is a one iteration loop, using the initialization loop from SMP to UP works.
The patchset does some cleanup for different drivers in order to make the init code the same. Then it introduces a generic function:
cpuidle_register(struct cpuidle_driver *drv, struct cpumask *cpumask)
The cpumask is for the coupled idle states.
The drivers are then modified to take into account this new function and to remove the duplicated code.
The benefit is observable in the diffstat: 332 lines of code removed.
Tested-on: u8500
Tested-on: at91
Tested-on: intel i5
Tested-on: OMAP4
Compiled with and without CPU_IDLE for:
u8500, at91, davinci, exynos, imx5, imx6, kirkwood, multi_v7 (for calxeda), omap2plus, s3c64, tegra1, tegra2, tegra3
Daniel Lezcano (19):
ARM: shmobile: cpuidle: remove shmobile_enter_wfi function
ARM: OMAP3: remove cpuidle_wrap_enter
cpuidle: remove en_core_tk_irqen flag
ARM: ux500: cpuidle: replace for_each_online_cpu by
for_each_possible_cpu
ARM: imx: cpuidle: create separate drivers for imx5/imx6
cpuidle: make a single register function for all
ARM: ux500: cpuidle: use init/exit common routine
ARM: at91: cpuidle: use init/exit common routine
ARM: OMAP3: cpuidle: use init/exit common routine
ARM: s3c64xx: cpuidle: use init/exit common routine
ARM: tegra: cpuidle: use init/exit common routine
ARM: shmobile: cpuidle: use init/exit common routine
ARM: OMAP4: cpuidle: use init/exit common routine
ARM: tegra: cpuidle: use init/exit common routine for tegra2
ARM: tegra: cpuidle: use init/exit common routine for tegra3
ARM: calxeda: cpuidle: use init/exit common routine
ARM: kirkwood: cpuidle: use init/exit common routine
ARM: davinci: cpuidle: use init/exit common routine
ARM: imx: cpuidle: use init/exit common routine
Documentation/cpuidle/driver.txt | 6 + arch/arm/mach-at91/cpuidle.c | 18 +-- arch/arm/mach-davinci/cpuidle.c | 21 +--- arch/arm/mach-exynos/cpuidle.c | 1 - arch/arm/mach-imx/Makefile | 1 + arch/arm/mach-imx/cpuidle-imx5.c | 40 +++++++ arch/arm/mach-imx/cpuidle-imx6q.c | 3 +- arch/arm/mach-imx/cpuidle.c | 80 ------------- arch/arm/mach-imx/cpuidle.h | 10 +- arch/arm/mach-imx/pm-imx5.c | 30 +---- arch/arm/mach-omap2/cpuidle34xx.c | 49 ++------ arch/arm/mach-omap2/cpuidle44xx.c | 23 +--- arch/arm/mach-s3c64xx/cpuidle.c | 15 +-- arch/arm/mach-shmobile/cpuidle.c | 11 +- arch/arm/mach-shmobile/include/mach/common.h | 3 - arch/arm/mach-shmobile/pm-sh7372.c | 2 - arch/arm/mach-tegra/cpuidle-tegra114.c | 27 +---- arch/arm/mach-tegra/cpuidle-tegra20.c | 31 +---- arch/arm/mach-tegra/cpuidle-tegra30.c | 28 +---- arch/arm/mach-ux500/cpuidle.c | 33 +----- arch/powerpc/platforms/pseries/processor_idle.c | 1 - arch/sh/kernel/cpu/shmobile/cpuidle.c | 1 - arch/x86/kernel/apm_32.c | 1 - drivers/acpi/processor_idle.c | 1 - drivers/cpuidle/cpuidle-calxeda.c | 53 +-------- drivers/cpuidle/cpuidle-kirkwood.c | 18 +-- drivers/cpuidle/cpuidle.c | 144 ++++++++++++++--------- drivers/idle/intel_idle.c | 1 - include/linux/cpuidle.h | 20 ++-- 29 files changed, 175 insertions(+), 497 deletions(-) create mode 100644 arch/arm/mach-imx/cpuidle-imx5.c delete mode 100644 arch/arm/mach-imx/cpuidle.c
Signature · 1 line
1.7.9.5
PATCH v2 1/19 ARM: shmobile: cpuidle: remove shmobile_enter_wfi function
Remove the shmobile_enter_wfi function which is the same as the common WFI enter function from the arm cpuidle driver defined with the ARM_CPUIDLE_WFI_STATE macro.
--- arch/arm/mach-shmobile/include/mach/common.h | 3 --- arch/arm/mach-shmobile/pm-sh7372.c | 1 - 2 files changed, 4 deletions(-)
arch/arm/mach-shmobile/include/mach/common.h +0 -3
@@ -13,9 +13,6 @@ extern int shmobile_clk_init(void);extern void shmobile_handle_irq_intc (struct pt_regs *);extern struct platform_suspend_ops shmobile_suspend_ops;struct cpuidle_driver ; -struct cpuidle_device ; -extern int shmobile_enter_wfi (struct cpuidle_device *dev, -struct cpuidle_driver *drv,int index);extern void shmobile_cpuidle_set_driver (struct cpuidle_driver *drv);extern void sh7372_init_irq (void );
arch/arm/mach-shmobile/pm-sh7372.c +0 -1
@@ -414,7 +414,6 @@ static struct cpuidle_driver sh7372_cpuidle_driver = { .state_count = 5, .safe_state_index = 0, /* C1 */ .states[0] = ARM_CPUIDLE_WFI_STATE, - .states[0].enter = shmobile_enter_wfi, .states[1] = { .name = "C2", .desc = "Core Standby Mode",
Signature · 1 line
1.7.9.5
PATCH v2 1/19 ARM: shmobile: cpuidle: remove shmobile_enter_wfi function
Quoted 3 lines · Daniel Lezcano
Remove the
shmobile_enter_wfifunction which is the same as the common WFI enter function from the arm cpuidle driver defined with theARM_CPUIDLE_WFI_STATEmacro.
Should this patch also make shmobile_enter_wfi static in arch/arm/mach-shmobile/cpuidle.c ?
Also, I have a slight preference for the patch to be split into two.
1. A patch to remove usage of shmobile_enter_wfi from the sh7372 SoC.
2. A patch to remove shmobile_enter_wfi. from common.h (and make it static?).
Quoted 35 lines
Signed-off-by Daniel Lezcano <[email protected]>--- arch/arm/mach-shmobile/include/mach/common.h | 3 --- arch/arm/mach-shmobile/pm-sh7372.c | 1 - 2 files changed, 4 deletions(-)arch/arm/mach-shmobile/include/mach/common.h +0
-3@@ -13,9 +13,6 @@ extern int shmobile_clk_init(void);extern void shmobile_handle_irq_intc (struct pt_regs *);extern struct platform_suspend_ops shmobile_suspend_ops;struct cpuidle_driver ; -struct cpuidle_device ; -extern int shmobile_enter_wfi (struct cpuidle_device *dev, -struct cpuidle_driver *drv,int index);extern void shmobile_cpuidle_set_driver (struct cpuidle_driver *drv);extern void sh7372_init_irq (void );arch/arm/mach-shmobile/pm-sh7372.c +0
-1@@ -414,7 +414,6 @@ static struct cpuidle_driver sh7372_cpuidle_driver = { .state_count = 5, .safe_state_index = 0, /* C1 */ .states[0] = ARM_CPUIDLE_WFI_STATE, - .states[0].enter = shmobile_enter_wfi, .states[1] = { .name = "C2", .desc = "Core Standby Mode",Signature · 1 line
1.7.9.5
PATCH v2 1/19 ARM: shmobile: cpuidle: remove shmobile_enter_wfi function
Quoted 6 lines · Simon Horman
Quoted 3 lines · Daniel Lezcano
Remove the
shmobile_enter_wfifunction which is the same as the common WFI enter function from the arm cpuidle driver defined with theARM_CPUIDLE_WFI_STATEmacro.Should this patch also make
shmobile_enter_wfistatic inarch/arm/mach-shmobile/cpuidle.c?
Hum, no :)
Actually, the function was removed because it was expected to be not longer used. I missed the cpuidle driver in the pm-sh7372.c file and the function declaration in the header file.
Quoted 4 lines
Also, I have a slight preference for the patch to be split into two.
1. A patch to remove usage ofshmobile_enter_wfifrom the sh7372 SoC.
2. A patch to removeshmobile_enter_wfi. fromcommon.h(and make it static?).
Ok, regarding my answer above, do you still want two patches for this ?
Thanks
-- Daniel
Signature · 5 lines
<http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
PATCH v2 1/19 ARM: shmobile: cpuidle: remove shmobile_enter_wfi function
Quoted 9 lines · Daniel Lezcano
Quoted 6 lines · Simon Horman
Quoted 3 lines · Daniel Lezcano
Remove the
shmobile_enter_wfifunction which is the same as the common WFI enter function from the arm cpuidle driver defined with theARM_CPUIDLE_WFI_STATEmacro.Should this patch also make
shmobile_enter_wfistatic inarch/arm/mach-shmobile/cpuidle.c?Hum, no :)
Ok, that was my other idea :^)
Quoted 9 lines
Actually, the function was removed because it was expected to be not longer used. I missed the cpuidle driver in the
pm-sh7372.cfile and the function declaration in the header file.Quoted 4 lines
Also, I have a slight preference for the patch to be split into two.
1. A patch to remove usage ofshmobile_enter_wfifrom the sh7372 SoC.
2. A patch to removeshmobile_enter_wfi. fromcommon.h(and make it static?).Ok, regarding my answer above, do you still want two patches for this ?
Yes please.
PATCH v2 1/19 ARM: shmobile: cpuidle: remove shmobile_enter_wfi function
Quoted 16 lines · Simon Horman
Quoted 9 lines · Daniel Lezcano
Quoted 6 lines · Simon Horman
Quoted 3 lines · Daniel Lezcano
Remove the
shmobile_enter_wfifunction which is the same as the common WFI enter function from the arm cpuidle driver defined with theARM_CPUIDLE_WFI_STATEmacro.Should this patch also make
shmobile_enter_wfistatic inarch/arm/mach-shmobile/cpuidle.c?Hum, no :)
Ok, that was my other idea :^)
Quoted 3 lines
Actually, the function was removed because it was expected to be not longer used. I missed the cpuidle driver in the
pm-sh7372.cfile and the function declaration in the header file.
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Also, I have a slight preference for the patch to be split into two.
1. A patch to remove usage ofshmobile_enter_wfifrom the sh7372 SoC.
2. A patch to removeshmobile_enter_wfi. fromcommon.h(and make it static?).Ok, regarding my answer above, do you still want two patches for this ?
Yes please.
Ok, thanks for the review.
-- Daniel
Quoted 5 lines
--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 5 lines
<http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
PATCH v2 2/19 ARM: OMAP3: remove cpuidle_wrap_enter
In reply to Daniel LezcanoIn a previous commit the en_core_tk_irqen flag has been added but we missed the cpuidle_wrap_enter which was doing the job to measure the time for the 'omap3_enter_idle' function.
Actually, I don't see any reason to use this wrapper in the code. In the better case, the time computation is not correctly done because of the different operations done in omap3_enter_idle_bm which were not taken into account before the en_core_tk_irqen flag was set.
As the time is reflected for the state overridden by the omap3_enter_idle_bm, using the wrapper is pointless now, so removing it.
--- arch/arm/mach-omap2/cpuidle34xx.c | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-)
arch/arm/mach-omap2/cpuidle34xx.c +9 -21
@@ -99,11 +99,15 @@ static struct omap3_idle_statedata omap3_idle_data[] = { }, }; -/* Private functions */ - -static int __omap3_enter_idle (struct cpuidle_device *dev, -struct cpuidle_driver *drv, -int index) +/** +* omap3_enter_idle - Programs OMAP3 to enter the specified state +* @dev: cpuidle device +* @drv: cpuidle driver +* @index: the index of state to be entered +*/ +static int omap3_enter_idle (struct cpuidle_device *dev, +struct cpuidle_driver *drv, +int index) {struct omap3_idle_statedata *cx = &omap3_idle_data[index];
@@ -149,22 +153,6 @@ return_sleep_time: }/** -* omap3_enter_idle - Programs OMAP3 to enter the specified state -* @dev: cpuidle device -* @drv: cpuidle driver -* @index: the index of state to be entered -* -* Called from the CPUidle framework to program the device to the -* specified target state selected by the governor. -*/ -static inline int omap3_enter_idle (struct cpuidle_device *dev, -struct cpuidle_driver *drv, -int index) -{ -return cpuidle_wrap_enter (dev, drv, index, __omap3_enter_idle); -} - -/** * next_valid_state - Find next valid C-state * @dev: cpuidle device * @drv: cpuidle driver
Signature · 1 line
1.7.9.5
PATCH v2 3/19 cpuidle: remove en_core_tk_irqen flag
In reply to Daniel LezcanoThe en_core_tk_irqen flag is set in all the cpuidle driver which means it is not necessary to specify this flag.
Remove the flag and the code related to it.
--- arch/arm/mach-at91/cpuidle.c | 1 - arch/arm/mach-davinci/cpuidle.c | 1 - arch/arm/mach-exynos/cpuidle.c | 1 - arch/arm/mach-imx/cpuidle-imx6q.c | 1 - arch/arm/mach-imx/pm-imx5.c | 1 - arch/arm/mach-omap2/cpuidle34xx.c | 1 - arch/arm/mach-omap2/cpuidle44xx.c | 1 - arch/arm/mach-s3c64xx/cpuidle.c | 1 - arch/arm/mach-shmobile/cpuidle.c | 1 - arch/arm/mach-shmobile/pm-sh7372.c | 1 - arch/arm/mach-tegra/cpuidle-tegra114.c | 1 - arch/arm/mach-tegra/cpuidle-tegra20.c | 1 - arch/arm/mach-tegra/cpuidle-tegra30.c | 1 - arch/arm/mach-ux500/cpuidle.c | 1 - arch/powerpc/platforms/pseries/processor_idle.c | 1 - arch/sh/kernel/cpu/shmobile/cpuidle.c | 1 - arch/x86/kernel/apm_32.c | 1 - drivers/acpi/processor_idle.c | 1 - drivers/cpuidle/cpuidle-calxeda.c | 1 - drivers/cpuidle/cpuidle-kirkwood.c | 1 - drivers/cpuidle/cpuidle.c | 72 ++++++----------------- drivers/idle/intel_idle.c | 1 - include/linux/cpuidle.h | 11 ---- 23 files changed, 18 insertions(+), 86 deletions(-)
arch/arm/mach-at91/cpuidle.c +0 -1
@@ -47,7 +47,6 @@ static int at91_enter_idle(struct cpuidle_device *dev,static struct cpuidle_driver at91_idle_driver = { .name ="at91_idle" , .owner =THIS_MODULE , - .en_core_tk_irqen =1 , .states[0 ] =ARM_CPUIDLE_WFI_STATE , .states[1 ] = { .enter = at91_enter_idle,
arch/arm/mach-davinci/cpuidle.c +0 -1
@@ -62,7 +62,6 @@ static int davinci_enter_idle(struct cpuidle_device *dev,static struct cpuidle_driver davinci_idle_driver = { .name ="cpuidle-davinci" , .owner =THIS_MODULE , - .en_core_tk_irqen =1 , .states[0 ] =ARM_CPUIDLE_WFI_STATE , .states[1 ] = { .enter = davinci_enter_idle,
arch/arm/mach-exynos/cpuidle.c +0 -1
@@ -58,7 +58,6 @@ static DEFINE_PER_CPU(struct cpuidle_device, exynos4_cpuidle_device);static struct cpuidle_driver exynos4_idle_driver = { .name ="exynos4_idle" , .owner =THIS_MODULE , - .en_core_tk_irqen =1 , };/* Ext-GIC nIRQ/nFIQ is the only wakeup source in AFTR */
arch/arm/mach-imx/cpuidle-imx6q.c +0 -1
@@ -45,7 +45,6 @@ done:static struct cpuidle_driver imx6q_cpuidle_driver = { .name ="imx6q_cpuidle" , .owner =THIS_MODULE , - .en_core_tk_irqen =1 , .states = {/* WFI */ ARM_CPUIDLE_WFI_STATE ,
arch/arm/mach-imx/pm-imx5.c +0 -1
@@ -164,7 +164,6 @@ static int imx5_cpuidle_enter(struct cpuidle_device *dev,static struct cpuidle_driver imx5_cpuidle_driver = { .name ="imx5_cpuidle" , .owner =THIS_MODULE , - .en_core_tk_irqen =1 , .states[0 ] = { .enter = imx5_cpuidle_enter, .exit_latency =2 ,
arch/arm/mach-omap2/cpuidle34xx.c +0 -1
@@ -264,7 +264,6 @@ static DEFINE_PER_CPU(struct cpuidle_device, omap3_idle_dev);static struct cpuidle_driver omap3_idle_driver = { .name ="omap3_idle" , .owner =THIS_MODULE , - .en_core_tk_irqen =1 , .states = { { .enter = omap3_enter_idle_bm,
arch/arm/mach-omap2/cpuidle44xx.c +0 -1
@@ -162,7 +162,6 @@ static DEFINE_PER_CPU(struct cpuidle_device, omap4_idle_dev);static struct cpuidle_driver omap4_idle_driver = { .name ="omap4_idle" , .owner =THIS_MODULE , - .en_core_tk_irqen =1 , .states = { {/* C1 - CPU0 ON + CPU1 ON + MPU ON */
arch/arm/mach-s3c64xx/cpuidle.c +0 -1
@@ -45,7 +45,6 @@ static DEFINE_PER_CPU(struct cpuidle_device, s3c64xx_cpuidle_device);static struct cpuidle_driver s3c64xx_cpuidle_driver = { .name ="s3c64xx_cpuidle" , .owner =THIS_MODULE , - .en_core_tk_irqen =1 , .states = { { .enter = s3c64xx_enter_idle,
arch/arm/mach-shmobile/cpuidle.c +0 -1
@@ -20,7 +20,6 @@ static struct cpuidle_device shmobile_cpuidle_dev;static struct cpuidle_driver shmobile_cpuidle_default_driver = { .name ="shmobile_cpuidle" , .owner =THIS_MODULE , - .en_core_tk_irqen =1 , .states[0 ] =ARM_CPUIDLE_WFI_STATE , .safe_state_index =0 ,/* C1 */ .state_count =1 ,
arch/arm/mach-shmobile/pm-sh7372.c +0 -1
@@ -410,7 +410,6 @@ static int sh7372_enter_a4s(struct cpuidle_device *dev,static struct cpuidle_driver sh7372_cpuidle_driver = { .name ="sh7372_cpuidle" , .owner =THIS_MODULE , - .en_core_tk_irqen =1 , .state_count =5 , .safe_state_index =0 ,/* C1 */ .states[0 ] =ARM_CPUIDLE_WFI_STATE ,
arch/arm/mach-tegra/cpuidle-tegra114.c +0 -1
@@ -23,7 +23,6 @@static struct cpuidle_driver tegra_idle_driver = { .name ="tegra_idle" , .owner =THIS_MODULE , - .en_core_tk_irqen =1 , .state_count =1 , .states = { [0 ] =ARM_CPUIDLE_WFI_STATE_PWR (600 ),
arch/arm/mach-tegra/cpuidle-tegra20.c +0 -1
@@ -51,7 +51,6 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,static struct cpuidle_driver tegra_idle_driver = { .name ="tegra_idle" , .owner =THIS_MODULE , - .en_core_tk_irqen =1 , .states = {ARM_CPUIDLE_WFI_STATE_PWR (600 ), #ifdef CONFIG_PM_SLEEP
arch/arm/mach-tegra/cpuidle-tegra30.c +0 -1
@@ -43,7 +43,6 @@ static int tegra30_idle_lp2(struct cpuidle_device *dev,static struct cpuidle_driver tegra_idle_driver = { .name ="tegra_idle" , .owner =THIS_MODULE , - .en_core_tk_irqen =1 , #ifdef CONFIG_PM_SLEEP .state_count =2 , #else
arch/arm/mach-ux500/cpuidle.c +0 -1
@@ -94,7 +94,6 @@ out:static struct cpuidle_driver ux500_idle_driver = { .name ="ux500_idle" , .owner =THIS_MODULE , - .en_core_tk_irqen =1 , .states = {ARM_CPUIDLE_WFI_STATE , {
arch/powerpc/platforms/pseries/processor_idle.c +0 -1
@@ -25,7 +25,6 @@struct cpuidle_driver pseries_idle_driver = { .name ="pseries_idle" , .owner =THIS_MODULE , - .en_core_tk_irqen =1 , };#define MAX_IDLE_STATE_COUNT 2
arch/sh/kernel/cpu/shmobile/cpuidle.c +0 -1
@@ -55,7 +55,6 @@ static struct cpuidle_device cpuidle_dev;static struct cpuidle_driver cpuidle_driver = { .name ="sh_idle" , .owner =THIS_MODULE , - .en_core_tk_irqen =1 , };void sh_mobile_setup_cpuidle (void )
arch/x86/kernel/apm_32.c +0 -1
@@ -373,7 +373,6 @@ static int apm_cpu_idle(struct cpuidle_device *dev,static struct cpuidle_driver apm_idle_driver = { .name ="apm_idle" , .owner =THIS_MODULE , - .en_core_tk_irqen =1 , .states = { {/* entry 0 is for polling */ }, {/* entry 1 is for APM idle */
drivers/acpi/processor_idle.c +0 -1
@@ -918,7 +918,6 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,struct cpuidle_driver acpi_idle_driver = { .name ="acpi_idle" , .owner =THIS_MODULE , - .en_core_tk_irqen =1 , };/**
drivers/cpuidle/cpuidle-calxeda.c +0 -1
@@ -100,7 +100,6 @@ static void calxeda_idle_cpuidle_devices_uninit(void)static struct cpuidle_driver calxeda_idle_driver = { .name ="calxeda_idle" , - .en_core_tk_irqen =1 , .states = {ARM_CPUIDLE_WFI_STATE , {
drivers/cpuidle/cpuidle-kirkwood.c +0 -1
@@ -41,7 +41,6 @@ static int kirkwood_enter_idle(struct cpuidle_device *dev,static struct cpuidle_driver kirkwood_idle_driver = { .name ="kirkwood_idle" , .owner =THIS_MODULE , - .en_core_tk_irqen =1 , .states[0 ] =ARM_CPUIDLE_WFI_STATE , .states[1 ] = { .enter = kirkwood_enter_idle,
drivers/cpuidle/cpuidle.c +18 -54
99 lines not on this page · raw message
drivers/idle/intel_idle.c +0 -1
@@ -71,7 +71,6 @@static struct cpuidle_driver intel_idle_driver = { .name ="intel_idle" , .owner =THIS_MODULE , - .en_core_tk_irqen =1 , };/* intel_idle.max_cstate=0 disables driver */ static int max_cstate =CPUIDLE_STATE_MAX -1 ;
include/linux/cpuidle.h +0 -11
@@ -105,8 +105,6 @@ struct cpuidle_driver {struct module *owner;int refcnt; -/* set to 1 to use the core cpuidle time keeping (for all states). */ - unsigned int en_core_tk_irqen:1;/* used by the cpuidle framework to setup the broadcast timer */ unsigned int bctimer:1;/* states array must be ordered in decreasing power consumption */
@@ -132,10 +130,6 @@ extern void cpuidle_pause(void);extern void cpuidle_resume (void );extern int cpuidle_enable_device (struct cpuidle_device *dev);extern void cpuidle_disable_device (struct cpuidle_device *dev); -extern int cpuidle_wrap_enter (struct cpuidle_device *dev, -struct cpuidle_driver *drv,int index, -int (*enter)(struct cpuidle_device *dev, -struct cpuidle_driver *drv,int index));extern int cpuidle_play_dead (void );extern struct cpuidle_driver *cpuidle_get_cpu_driver (struct cpuidle_device *dev);
@@ -162,11 +156,6 @@ static inline void cpuidle_resume(void) { }static inline int cpuidle_enable_device (struct cpuidle_device *dev) {return -ENODEV ; }static inline void cpuidle_disable_device (struct cpuidle_device *dev) { } -static inline int cpuidle_wrap_enter (struct cpuidle_device *dev, -struct cpuidle_driver *drv,int index, -int (*enter)(struct cpuidle_device *dev, -struct cpuidle_driver *drv,int index)) -{return -ENODEV ; }static inline int cpuidle_play_dead (void ) {return -ENODEV ; }#endif
Signature · 1 line
1.7.9.5
PATCH v2 4/19 ARM: ux500: cpuidle: replace for_each_online_cpu by for_each_possible_cpu
In reply to Daniel LezcanoAll the drivers are using, in their initialization function, the for_each_possible_cpu macro.
Using for_each_online_cpu means the driver must handle the initialization of the cpuidle device when a cpu is up which is not the case here.
Change the macro to for_each_possible_cpu as that fix the hotplug initialization and make the initialization routine consistent with the rest of the code in the different drivers.
--- arch/arm/mach-ux500/cpuidle.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-ux500/cpuidle.c +2 -2
@@ -125,7 +125,7 @@ int __init ux500_idle_init(void)return ret; } -for_each_online_cpu (cpu) { +for_each_possible (cpu) { device = &per_cpu (ux500_cpuidle_device, cpu); device->cpu = cpu; ret =cpuidle_register_device (device);
@@ -139,7 +139,7 @@ out:return ret; out_unregister: -for_each_online_cpu (cpu) { +for_each_possible_cpu (cpu) { device = &per_cpu (ux500_cpuidle_device, cpu);cpuidle_unregister_device (device); }
Signature · 1 line
1.7.9.5
PATCH v2 5/19 ARM: imx: cpuidle: create separate drivers for imx5/imx6
In reply to Daniel LezcanoThe code intializes the cpuidle driver at different places. The cpuidle driver for :
* imx5 : is in the pm-imx5.c, the init function is in cpuidle.c
* imx6 : is in cpuidle-imx6q.c, the init function is in cpuidle.c and cpuidle-imx6q.c
Instead of having the cpuidle code spread across different files, let's write a driver for each SoC and make the code similar.
That implies some code duplication but that will be fixed with the next patches which consolidate the initialization for all the drivers.
--- arch/arm/mach-imx/Makefile | 1 + arch/arm/mach-imx/cpuidle-imx5.c | 74 ++++++++++++++++++++++++++++++++++ arch/arm/mach-imx/cpuidle-imx6q.c | 36 ++++++++++++++++- arch/arm/mach-imx/cpuidle.c | 80 ------------------------------------- arch/arm/mach-imx/cpuidle.h | 10 ++--- arch/arm/mach-imx/pm-imx5.c | 29 +------------- 6 files changed, 115 insertions(+), 115 deletions(-) create mode 100644 arch/arm/mach-imx/cpuidle-imx5.c delete mode 100644 arch/arm/mach-imx/cpuidle.c
arch/arm/mach-imx/Makefile +1 -0
@@ -31,6 +31,7 @@ obj-$(CONFIG_CPU_FREQ_IMX) += cpufreq.o ifeq ($(CONFIG_CPU_IDLE),y) obj-y += cpuidle.o +obj-$(CONFIG_SOC_IMX5) += cpuidle-imx5.o obj-$(CONFIG_SOC_IMX6Q) += cpuidle-imx6q.o endif
arch/arm/mach-imx/cpuidle-imx5.c new file +74 -0
74 lines not on this page · raw message
arch/arm/mach-imx/cpuidle-imx6q.c +35 -1
@@ -14,6 +14,8 @@#include "common.h" #include "cpuidle.h" +static DEFINE_PER_CPU(struct cpuidle_device, devices); +static atomic_t master =ATOMIC_INIT (0 );static DEFINE_SPINLOCK (master_lock);
@@ -65,11 +67,43 @@ static struct cpuidle_driver imx6q_cpuidle_driver = {int __init imx6q_cpuidle_init (void ) { +struct cpuidle_device *dev; +int cpu, ret; +/* Need to enable SCU standby for entering WAIT modes */ imx_scu_standby_enable ();/* Set chicken bit to get a reliable WAIT mode support */ imx6q_set_chicken_bit (); -return imx_cpuidle_init (&imx6q_cpuidle_driver); + ret =cpuidle_register_driver (&imx6q_cpuidle_driver); +if (ret) { +pr_err ("%s: Failed to register cpuidle driver with error: %d\n" , + __func__, ret); +return ret; + } + +/* initialize state data for each cpuidle_device */ +for_each_possible_cpu (cpu) { + dev = &per_cpu (devices, cpu); + dev->cpu = cpu; + + ret =cpuidle_register_device (dev); +if (ret) { +pr_err ("%s: Failed to register cpu %u, error: %d\n" , + __func__, cpu, ret); + goto out_unregister; + } + } + +return 0 ; + +out_unregister: +for_each_possible_cpu (cpu) { + dev = &per_cpu (devices, cpu); +cpuidle_unregister_device (dev); + } + +cpuidle_unregister_driver (&imx6q_cpuidle_driver); +return ret; }
arch/arm/mach-imx/cpuidle.c deleted +0 -80
80 lines not on this page · raw message
arch/arm/mach-imx/cpuidle.h +4 -6
@@ -10,18 +10,16 @@* http://www.gnu.org/copyleft/gpl.html */ -#include <linux/cpuidle.h> -#ifdef CONFIG_CPU_IDLE -extern int imx_cpuidle_init (struct cpuidle_driver *drv); +extern int imx5_cpuidle_init (void );extern int imx6q_cpuidle_init (void );#else -static inline int imx_cpuidle_init (struct cpuidle_driver *drv) +static inline int imx5_cpuidle_init (void ) { -return -ENODEV ; +return 0 ; }static inline int imx6q_cpuidle_init (void ) { -return -ENODEV ; +return 0 ; }#endif
arch/arm/mach-imx/pm-imx5.c +1 -28
@@ -149,32 +149,6 @@ static void imx5_pm_idle(void)imx5_cpu_do_idle (); } -static int imx5_cpuidle_enter (struct cpuidle_device *dev, -struct cpuidle_driver *drv,int idx) -{ -int ret; - - ret =imx5_cpu_do_idle (); -if (ret <0 ) -return ret; - -return idx; -} - -static struct cpuidle_driver imx5_cpuidle_driver = { - .name ="imx5_cpuidle" , - .owner =THIS_MODULE , - .states[0 ] = { - .enter = imx5_cpuidle_enter, - .exit_latency =2 , - .target_residency =1 , - .flags =CPUIDLE_FLAG_TIME_VALID , - .name ="IMX5 SRPG" , - .desc ="CPU state retained,powered off" , - }, - .state_count =1 , -}; -static int __init imx5_pm_common_init (void ) {int ret;
@@ -192,8 +166,7 @@ static int __init imx5_pm_common_init(void)/* Set the registers to the default cpu idle state. */ mx5_cpu_lp_set (IMX5_DEFAULT_CPU_IDLE_STATE ); -imx_cpuidle_init (&imx5_cpuidle_driver); -return 0 ; +return imx5_cpuidle_init (); }void __init imx51_pm_init (void )
Signature · 1 line
1.7.9.5
PATCH v2 6/19 cpuidle: make a single register function for all
In reply to Daniel LezcanoThe usual scheme to initialize a cpuidle driver on a SMP is:
cpuidle_register_driver(drv);
for_each_possible_cpu(cpu) {
device = &per_cpu(cpuidle_dev, cpu);
cpuidle_register_device(device);
}This code is duplicated in each cpuidle driver.
On UP systems, it is done this way:
cpuidle_register_driver(drv); device = &per_cpu(cpuidle_dev, cpu); cpuidle_register_device(device);
On UP, the macro 'for_each_cpu' does one iteration:
#define for_each_cpu(cpu, mask) \
for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)mask)Hence, the initialization loop is the same for UP than SMP.
Beside, we saw different bugs / mis-initialization / return code unchecked in the different drivers, the code is duplicated including bugs. After fixing all these ones, it appears the initialization pattern is the same for everyone.
Please note, some drivers are doing dev->state_count = drv->state_count. This is not necessary because it is done by the cpuidle_enable_device function in the cpuidle framework. This is true, until you have the same states for all your devices. Otherwise, the 'low level' API should be used instead with the specific initialization for the driver.
Let's add a wrapper function doing this initialization with a cpumask parameter for the coupled idle states and use it for all the drivers.
That will save a lot of LOC, consolidate the code, and the modifications in the future could be done in a single place. Another benefit is the consolidation of the cpuidle_device variable which is now in the cpuidle framework and no longer spread accross the different arch specific drivers.
--- Documentation/cpuidle/driver.txt | 6 ++++ drivers/cpuidle/cpuidle.c | 72 ++++++++++++++++++++++++++++++++++++++ include/linux/cpuidle.h | 9 +++-- 3 files changed, 85 insertions(+), 2 deletions(-)
Documentation/cpuidle/driver.txt +6 -0
@@ -15,11 +15,17 @@ has mechanisms in place to support actual entry-exit into CPU idle states. cpuidle driver initializes the cpuidle_device structure for each CPU device and registers with cpuidle using cpuidle_register_device. +If all the idle states are the same, the wrapper function cpuidle_register +could be used instead. + It can also support the dynamic changes (like battery <-> AC), by using cpuidle_pause_and_lock, cpuidle_disable_device and cpuidle_enable_device, cpuidle_resume_and_unlock. Interfaces: +extern int cpuidle_register(struct cpuidle_driver *drv, + const struct cpumask *const coupled_cpus); +extern int cpuidle_unregister(struct cpuidle_driver *drv); extern int cpuidle_register_driver(struct cpuidle_driver *drv); extern void cpuidle_unregister_driver(struct cpuidle_driver *drv); extern int cpuidle_register_device(struct cpuidle_device *dev);
drivers/cpuidle/cpuidle.c +72 -0
84 lines not on this page · raw message
include/linux/cpuidle.h +7 -2
@@ -123,7 +123,9 @@ extern void cpuidle_driver_unref(void);extern void cpuidle_unregister_driver (struct cpuidle_driver *drv);extern int cpuidle_register_device (struct cpuidle_device *dev);extern void cpuidle_unregister_device (struct cpuidle_device *dev); - +extern int cpuidle_register (struct cpuidle_driver *drv, +const struct cpumask *const coupled_cpus); +extern void cpuidle_unregister (struct cpuidle_driver *drv);extern void cpuidle_pause_and_lock (void );extern void cpuidle_resume_and_unlock (void );extern void cpuidle_pause (void );
@@ -148,7 +150,10 @@ static inline void cpuidle_unregister_driver(struct cpuidle_driver *drv) { }static inline int cpuidle_register_device (struct cpuidle_device *dev) {return -ENODEV ; }static inline void cpuidle_unregister_device (struct cpuidle_device *dev) { } - +static inline int cpuidle_register (struct cpuidle_driver *drv, +const struct cpumask *const coupled_cpus) +{return -ENODEV ; } +static inline void cpuidle_unregister (struct cpuidle_driver *drv) { }static inline void cpuidle_pause_and_lock (void ) { }static inline void cpuidle_resume_and_unlock (void ) { }static inline void cpuidle_pause (void ) { }
Signature · 1 line
1.7.9.5
PATCH v2 7/19 ARM: ux500: cpuidle: use init/exit common routine
In reply to Daniel LezcanoRemove the duplicate code and use the cpuidle common code for initialization.
--- arch/arm/mach-ux500/cpuidle.c | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-)
arch/arm/mach-ux500/cpuidle.c +1 -31
@@ -21,7 +21,6 @@static atomic_t master =ATOMIC_INIT (0 );static DEFINE_SPINLOCK (master_lock); -static DEFINE_PER_CPU(struct cpuidle_device, ux500_cpuidle_device);static inline int ux500_enter_idle (struct cpuidle_device *dev,struct cpuidle_driver *drv,int index)
@@ -112,40 +111,11 @@ static struct cpuidle_driver ux500_idle_driver = {int __init ux500_idle_init (void ) { -int ret, cpu; -struct cpuidle_device *device; -/* Configure wake up reasons */ prcmu_enable_wakeups (PRCMU_WAKEUP (ARM ) |PRCMU_WAKEUP (RTC ) |PRCMU_WAKEUP (ABB )); - ret =cpuidle_register_driver (&ux500_idle_driver); -if (ret) { -printk (KERN_ERR "failed to register ux500 idle driver\n" ); -return ret; - } - -for_each_possible (cpu) { - device = &per_cpu (ux500_cpuidle_device, cpu); - device->cpu = cpu; - ret =cpuidle_register_device (device); -if (ret) { -printk (KERN_ERR "Failed to register cpuidle " -"device for cpu%d\n" , cpu); - goto out_unregister; - } - } -out: -return ret; - -out_unregister: -for_each_possible_cpu (cpu) { - device = &per_cpu (ux500_cpuidle_device, cpu); -cpuidle_unregister_device (device); - } - -cpuidle_unregister_driver (&ux500_idle_driver); - goto out; +return cpuidle_register (&ux500_idle_driver,NULL ); }device_initcall (ux500_idle_init);
Signature · 1 line
1.7.9.5
PATCH v2 8/19 ARM: at91: cpuidle: use init/exit common routine
In reply to Daniel LezcanoRemove the duplicate code and use the arm cpuidle driver's common code for initialization.
--- arch/arm/mach-at91/cpuidle.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-)
arch/arm/mach-at91/cpuidle.c +2 -15
@@ -27,8 +27,6 @@#define AT91_MAX_STATES 2 -static DEFINE_PER_CPU(struct cpuidle_device, at91_cpuidle_device); -/* Actual code that puts the SoC in different idle states */ static int at91_enter_idle(struct cpuidle_device *dev, struct cpuidle_driver *drv,
@@ -60,20 +58,9 @@ static struct cpuidle_driver at91_idle_driver = { };/* Initialize CPU idle by registering the idle states */ -static int at91_init_cpuidle (void ) +static int __init at91_init_cpuidle (void ) { -struct cpuidle_device *device; - - device = &per_cpu (at91_cpuidle_device,smp_processor_id ()); - device->state_count =AT91_MAX_STATES ; - -cpuidle_register_driver (&at91_idle_driver); - -if (cpuidle_register_device (device)) { -printk (KERN_ERR "at91_init_cpuidle: Failed registering\n" ); -return -EIO ; - } -return 0 ; +return cpuidle_register (&at91_idle_driver,NULL ); }device_initcall (at91_init_cpuidle);
Signature · 1 line
1.7.9.5
PATCH v2 9/19 ARM: OMAP3: cpuidle: use init/exit common routine
In reply to Daniel LezcanoRemove the duplicated code and use the cpuidle common code for initialization.
--- arch/arm/mach-omap2/cpuidle34xx.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-)
arch/arm/mach-omap2/cpuidle34xx.c +2 -16
@@ -26,6 +26,7 @@#include <linux/cpuidle.h> #include <linux/export.h> #include <linux/cpu_pm.h> +#include <asm/cpuidle.h> #include "powerdomain.h" #include "clockdomain.h"
@@ -259,8 +260,6 @@ static int omap3_enter_idle_bm(struct cpuidle_device *dev,return ret; } -static DEFINE_PER_CPU(struct cpuidle_device, omap3_idle_dev); -static struct cpuidle_driver omap3_idle_driver = { .name ="omap3_idle" , .owner =THIS_MODULE ,
@@ -336,8 +335,6 @@ static struct cpuidle_driver omap3_idle_driver = {*/ int __init omap3_idle_init (void ) { -struct cpuidle_device *dev; - mpu_pd =pwrdm_lookup ("mpu_pwrdm" ); core_pd =pwrdm_lookup ("core_pwrdm" ); per_pd =pwrdm_lookup ("per_pwrdm" );
@@ -346,16 +343,5 @@ int __init omap3_idle_init(void)if (!mpu_pd || !core_pd || !per_pd || !cam_pd)return -ENODEV ; -cpuidle_register_driver (&omap3_idle_driver); - - dev = &per_cpu (omap3_idle_dev,smp_processor_id ()); - dev->cpu =0 ; - -if (cpuidle_register_device (dev)) { -printk (KERN_ERR "%s: CPUidle register device failed\n" , - __func__); -return -EIO ; - } - -return 0 ; +return cpuidle_register (&omap3_idle_driver,NULL ); }
Signature · 1 line
1.7.9.5
PATCH v2 10/19 ARM: s3c64xx: cpuidle: use init/exit common routine
In reply to Daniel LezcanoRemove the duplicated code and use the cpuidle common code for initialization.
--- arch/arm/mach-s3c64xx/cpuidle.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-)
arch/arm/mach-s3c64xx/cpuidle.c +1 -13
@@ -40,8 +40,6 @@ static int s3c64xx_enter_idle(struct cpuidle_device *dev,return index; } -static DEFINE_PER_CPU(struct cpuidle_device, s3c64xx_cpuidle_device); -static struct cpuidle_driver s3c64xx_cpuidle_driver = { .name ="s3c64xx_cpuidle" , .owner =THIS_MODULE ,
@@ -60,16 +58,6 @@ static struct cpuidle_driver s3c64xx_cpuidle_driver = {static int __init s3c64xx_init_cpuidle (void ) { -int ret; - -cpuidle_register_driver (&s3c64xx_cpuidle_driver); - - ret =cpuidle_register_device (&s3c64xx_cpuidle_device); -if (ret) { -pr_err ("Failed to register cpuidle device: %d\n" , ret); -return ret; - } - -return 0 ; +return cpuidle_register (&s3c64xx_cpuidle_driver,NULL ); }device_initcall (s3c64xx_init_cpuidle);
Signature · 1 line
1.7.9.5
PATCH v2 11/19 ARM: tegra: cpuidle: use init/exit common routine
In reply to Daniel LezcanoRemove the duplicated code and use the cpuidle common code for initialization.
--- arch/arm/mach-tegra/cpuidle-tegra114.c | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-)
arch/arm/mach-tegra/cpuidle-tegra114.c +1 -25
@@ -29,31 +29,7 @@ static struct cpuidle_driver tegra_idle_driver = { }, }; -static DEFINE_PER_CPU(struct cpuidle_device, tegra_idle_device); -int __init tegra114_cpuidle_init (void ) { -int ret; -unsigned int cpu; -struct cpuidle_device *dev; -struct cpuidle_driver *drv = &tegra_idle_driver; - - ret =cpuidle_register_driver (&tegra_idle_driver); -if (ret) { -pr_err ("CPUidle driver registration failed\n" ); -return ret; - } - -for_each_possible_cpu (cpu) { - dev = &per_cpu (tegra_idle_device, cpu); - dev->cpu = cpu; - - ret =cpuidle_register_device (dev); -if (ret) { -pr_err ("CPU%u: CPUidle device registration failed\n" , - cpu); -return ret; - } - } -return 0 ; +return cpuidle_register (&tegra_idle_driver,NULL ); }
Signature · 1 line
1.7.9.5
PATCH v2 12/19 ARM: shmobile: cpuidle: use init/exit common routine
In reply to Daniel LezcanoRemove the duplicated code and use the cpuidle common code for initialization.
--- arch/arm/mach-shmobile/cpuidle.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
arch/arm/mach-shmobile/cpuidle.c +1 -9
@@ -16,7 +16,6 @@#include <asm/cpuidle.h> #include <asm/io.h> -static struct cpuidle_device shmobile_cpuidle_dev;static struct cpuidle_driver shmobile_cpuidle_default_driver = { .name ="shmobile_cpuidle" , .owner =THIS_MODULE ,
@@ -34,12 +33,5 @@ void __init shmobile_cpuidle_set_driver(struct cpuidle_driver *drv)int __init shmobile_cpuidle_init (void ) { -struct cpuidle_device *dev = &shmobile_cpuidle_dev; - -cpuidle_register_driver (cpuidle_drv); - - dev->state_count = cpuidle_drv->state_count; -cpuidle_register_device (dev); - -return 0 ; +return cpuidle_register (cpuidle_drv,NULL ); }
Signature · 1 line
1.7.9.5
PATCH v2 13/19 ARM: OMAP4: cpuidle: use init/exit common routine
In reply to Daniel LezcanoRemove the duplicated code and use the cpuidle common code for initialization.
--- arch/arm/mach-omap2/cpuidle44xx.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-)
arch/arm/mach-omap2/cpuidle44xx.c +2 -20
@@ -15,6 +15,7 @@#include <linux/cpu_pm.h> #include <linux/export.h> +#include <asm/cpuidle.h> #include <asm/proc-fns.h> #include "common.h"
@@ -157,8 +158,6 @@ fail:return index; } -static DEFINE_PER_CPU(struct cpuidle_device, omap4_idle_dev); -static struct cpuidle_driver omap4_idle_driver = { .name ="omap4_idle" , .owner =THIS_MODULE ,
@@ -207,9 +206,6 @@ static struct cpuidle_driver omap4_idle_driver = {*/ int __init omap4_idle_init (void ) { -struct cpuidle_device *dev; -unsigned int cpu_id =0 ; - mpu_pd =pwrdm_lookup ("mpu_pwrdm" ); cpu_pd[0 ] =pwrdm_lookup ("cpu0_pwrdm" ); cpu_pd[1 ] =pwrdm_lookup ("cpu1_pwrdm" );
@@ -221,19 +217,5 @@ int __init omap4_idle_init(void)if (!cpu_clkdm[0 ] || !cpu_clkdm[1 ])return -ENODEV ; -for_each_cpu (cpu_id, cpu_online_mask) { - dev = &per_cpu (omap4_idle_dev, cpu_id); - dev->cpu = cpu_id; -#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED - dev->coupled_cpus = *cpu_online_mask; -#endif -cpuidle_register_driver (&omap4_idle_driver); - -if (cpuidle_register_device (dev)) { -pr_err ("%s: CPUidle register failed\n" , __func__); -return -EIO ; - } - } - -return 0 ; +return cpuidle_register (&omap4_idle_driver, cpu_online_mask); }
Signature · 1 line
1.7.9.5
PATCH v2 14/19 ARM: tegra: cpuidle: use init/exit common routine for tegra2
In reply to Daniel LezcanoRemove the duplicated code and use the cpuidle common code for initialization.
--- arch/arm/mach-tegra/cpuidle-tegra20.c | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-)
arch/arm/mach-tegra/cpuidle-tegra20.c +1 -29
@@ -70,8 +70,6 @@ static struct cpuidle_driver tegra_idle_driver = { .safe_state_index = 0, }; -static DEFINE_PER_CPU(struct cpuidle_device, tegra_idle_device); -#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_SMP static void __iomem *pmc =IO_ADDRESS (TEGRA_PMC_BASE );
@@ -220,34 +218,8 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,int __init tegra20_cpuidle_init (void ) { -int ret; -unsigned int cpu; -struct cpuidle_device *dev; -struct cpuidle_driver *drv = &tegra_idle_driver; -#ifdef CONFIG_PM_SLEEP tegra_tear_down_cpu = tegra20_tear_down_cpu;#endif - - ret =cpuidle_register_driver (&tegra_idle_driver); -if (ret) { -pr_err ("CPUidle driver registration failed\n" ); -return ret; - } - -for_each_possible_cpu (cpu) { - dev = &per_cpu (tegra_idle_device, cpu); - dev->cpu = cpu; -#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED - dev->coupled_cpus = *cpu_possible_mask; -#endif - - ret =cpuidle_register_device (dev); -if (ret) { -pr_err ("CPU%u: CPUidle device registration failed\n" , - cpu); -return ret; - } - } -return 0 ; +return cpuidle_register (&tegra_idle_driver, cpu_possible_mask); }
Signature · 1 line
1.7.9.5
PATCH v2 15/19 ARM: tegra: cpuidle: use init/exit common routine for tegra3
In reply to Daniel LezcanoRemove the duplicated code and use the cpuidle common code for initialization.
--- arch/arm/mach-tegra/cpuidle-tegra30.c | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-)
arch/arm/mach-tegra/cpuidle-tegra30.c +1 -26
@@ -64,8 +64,6 @@ static struct cpuidle_driver tegra_idle_driver = { }, }; -static DEFINE_PER_CPU(struct cpuidle_device, tegra_idle_device); -#ifdef CONFIG_PM_SLEEP static bool tegra30_cpu_cluster_power_down(struct cpuidle_device *dev, struct cpuidle_driver *drv,
@@ -156,31 +154,8 @@ static int tegra30_idle_lp2(struct cpuidle_device *dev,int __init tegra30_cpuidle_init (void ) { -int ret; -unsigned int cpu; -struct cpuidle_device *dev; -struct cpuidle_driver *drv = &tegra_idle_driver; -#ifdef CONFIG_PM_SLEEP tegra_tear_down_cpu = tegra30_tear_down_cpu;#endif - - ret =cpuidle_register_driver (&tegra_idle_driver); -if (ret) { -pr_err ("CPUidle driver registration failed\n" ); -return ret; - } - -for_each_possible_cpu (cpu) { - dev = &per_cpu (tegra_idle_device, cpu); - dev->cpu = cpu; - - ret =cpuidle_register_device (dev); -if (ret) { -pr_err ("CPU%u: CPUidle device registration failed\n" , - cpu); -return ret; - } - } -return 0 ; +return cpuidle_register (&tegra_idle_driver,NULL ); }
Signature · 1 line
1.7.9.5
PATCH v2 16/19 ARM: calxeda: cpuidle: use init/exit common routine
In reply to Daniel LezcanoRemove the duplicated code and use the cpuidle common code for initialization.
--- drivers/cpuidle/cpuidle-calxeda.c | 52 +------------------------------------ 1 file changed, 1 insertion(+), 51 deletions(-)
drivers/cpuidle/cpuidle-calxeda.c +1 -51
@@ -35,8 +35,6 @@extern void highbank_set_cpu_jump (int cpu,void *jump_addr);extern void *scu_base_addr; -static struct cpuidle_device __percpu *calxeda_idle_cpuidle_devices; -static inline unsigned int get_auxcr (void ) {unsigned int val;
@@ -85,19 +83,6 @@ static int calxeda_pwrdown_idle(struct cpuidle_device *dev,return index; } -static void calxeda_idle_cpuidle_devices_uninit (void ) -{ -int i; -struct cpuidle_device *dev; - -for_each_possible_cpu (i) { - dev =per_cpu_ptr (calxeda_idle_cpuidle_devices, i); -cpuidle_unregister_device (dev); - } - -free_percpu (calxeda_idle_cpuidle_devices); -} -static struct cpuidle_driver calxeda_idle_driver = { .name ="calxeda_idle" , .states = {
@@ -117,44 +102,9 @@ static struct cpuidle_driver calxeda_idle_driver = {static int __init calxeda_cpuidle_init (void ) { -int cpu_id; -int ret; -struct cpuidle_device *dev; -struct cpuidle_driver *drv = &calxeda_idle_driver; -if (!of_machine_is_compatible ("calxeda,highbank" ))return -ENODEV ; - ret =cpuidle_register_driver (drv); -if (ret) -return ret; - - calxeda_idle_cpuidle_devices = alloc_percpu(struct cpuidle_device); -if (calxeda_idle_cpuidle_devices ==NULL ) { - ret = -ENOMEM ; - goto unregister_drv; - } - -/* initialize state data for each cpuidle_device */ -for_each_possible_cpu (cpu_id) { - dev =per_cpu_ptr (calxeda_idle_cpuidle_devices, cpu_id); - dev->cpu = cpu_id; - dev->state_count = drv->state_count; - - ret =cpuidle_register_device (dev); -if (ret) { -pr_err ("Failed to register cpu %u, error: %d\n" , - cpu_id, ret); - goto uninit; - } - } - -return 0 ; - -uninit: -calxeda_idle_cpuidle_devices_uninit (); -unregister_drv: -cpuidle_unregister_driver (drv); -return ret; +return cpuidle_register (&calxeda_idle_driver,NULL ); }module_init (calxeda_cpuidle_init);
Signature · 1 line
1.7.9.5
PATCH v2 17/19 ARM: kirkwood: cpuidle: use init/exit common routine
In reply to Daniel LezcanoRemove the duplicated code and use the cpuidle common code for initialization.
--- drivers/cpuidle/cpuidle-kirkwood.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-)
drivers/cpuidle/cpuidle-kirkwood.c +2 -15
@@ -52,9 +52,6 @@ static struct cpuidle_driver kirkwood_idle_driver = { }, .state_count = KIRKWOOD_MAX_STATES, }; -static struct cpuidle_device *device; - -static DEFINE_PER_CPU(struct cpuidle_device, kirkwood_cpuidle_device);/* Initialize CPU idle by registering the idle states */ static int kirkwood_cpuidle_probe (struct platform_device *pdev)
@@ -69,22 +66,12 @@ static int kirkwood_cpuidle_probe(struct platform_device *pdev)if (IS_ERR (ddr_operation_base))return PTR_ERR (ddr_operation_base); - device = &per_cpu (kirkwood_cpuidle_device,smp_processor_id ()); - device->state_count =KIRKWOOD_MAX_STATES ; - -cpuidle_register_driver (&kirkwood_idle_driver); -if (cpuidle_register_device (device)) { -pr_err ("kirkwood_init_cpuidle: Failed registering\n" ); -return -EIO ; - } -return 0 ; +return cpuidle_register (&kirkwood_idle_driver,NULL ); }int kirkwood_cpuidle_remove (struct platform_device *pdev) { -cpuidle_unregister_device (device); -cpuidle_unregister_driver (&kirkwood_idle_driver); - +cpuidle_unregister (&kirkwood_idle_driver);return 0 ; }
Signature · 1 line
1.7.9.5
PATCH v2 18/19 ARM: davinci: cpuidle: use init/exit common routine
In reply to Daniel LezcanoRemove the duplicated code and use the cpuidle common code for initialization.
--- arch/arm/mach-davinci/cpuidle.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-)
arch/arm/mach-davinci/cpuidle.c +1 -19
@@ -25,7 +25,6 @@#define DAVINCI_CPUIDLE_MAX_STATES 2 -static DEFINE_PER_CPU(struct cpuidle_device, davinci_cpuidle_device);static void __iomem *ddr2_reg_base;static bool ddr2_pdown;
@@ -76,12 +75,8 @@ static struct cpuidle_driver davinci_idle_driver = {static int __init davinci_cpuidle_probe (struct platform_device *pdev) { -int ret; -struct cpuidle_device *device;struct davinci_cpuidle_config *pdata = pdev->dev.platform_data; - device = &per_cpu (davinci_cpuidle_device,smp_processor_id ()); -if (!pdata) {dev_err (&pdev->dev,"cannot get platform data\n" );return -ENOENT ;
@@ -91,20 +86,7 @@ static int __init davinci_cpuidle_probe(struct platform_device *pdev) ddr2_pdown = pdata->ddr2_pdown; - ret =cpuidle_register_driver (&davinci_idle_driver); -if (ret) { -dev_err (&pdev->dev,"failed to register driver\n" ); -return ret; - } - - ret =cpuidle_register_device (device); -if (ret) { -dev_err (&pdev->dev,"failed to register device\n" ); -cpuidle_unregister_driver (&davinci_idle_driver); -return ret; - } - -return 0 ; +return cpuidle_register (&davinci_idle_driver,NULL ); }static struct platform_driver davinci_cpuidle_driver = {
Signature · 1 line
1.7.9.5
PATCH v2 19/19 ARM: imx: cpuidle: use init/exit common routine
In reply to Daniel LezcanoRemove the duplicated code and use the cpuidle common code for initialization.
--- arch/arm/mach-imx/cpuidle-imx5.c | 36 +----------------------------------- arch/arm/mach-imx/cpuidle-imx6q.c | 36 +----------------------------------- 2 files changed, 2 insertions(+), 70 deletions(-)
arch/arm/mach-imx/cpuidle-imx5.c +1 -35
@@ -13,8 +13,6 @@#include "hardware.h" -static DEFINE_PER_CPU(struct cpuidle_device, devices); -static int imx5_cpuidle_enter (struct cpuidle_device *dev,struct cpuidle_driver *drv,int index) {
@@ -38,37 +36,5 @@ static struct cpuidle_driver imx5_cpuidle_driver = {int __init imx5_cpuidle_init (void ) { -struct cpuidle_device *dev; -int cpu, ret; - - ret =cpuidle_register_driver (&imx5_cpuidle_driver); -if (ret) { -pr_err ("%s: Failed to register cpuidle driver with error: %d\n" , - __func__, ret); -return ret; - } - -/* initialize state data for each cpuidle_device */ -for_each_possible_cpu (cpu) { - dev = &per_cpu (devices, cpu); - dev->cpu = cpu; - - ret =cpuidle_register_device (dev); -if (ret) { -pr_err ("%s: Failed to register cpu %u, error: %d\n" , - __func__, cpu, ret); - goto out_unregister; - } - } - -return 0 ; - -out_unregister: -for_each_possible_cpu (cpu) { - dev = &per_cpu (devices, cpu); -cpuidle_unregister_device (dev); - } - -cpuidle_unregister_driver (&imx5_cpuidle_driver); -return ret; +return cpuidle_register (&imx5_cpuidle_driver,NULL ); }
arch/arm/mach-imx/cpuidle-imx6q.c +1 -35
@@ -14,8 +14,6 @@#include "common.h" #include "cpuidle.h" -static DEFINE_PER_CPU(struct cpuidle_device, devices); -static atomic_t master =ATOMIC_INIT (0 );static DEFINE_SPINLOCK (master_lock);
@@ -67,43 +65,11 @@ static struct cpuidle_driver imx6q_cpuidle_driver = {int __init imx6q_cpuidle_init (void ) { -struct cpuidle_device *dev; -int cpu, ret; -/* Need to enable SCU standby for entering WAIT modes */ imx_scu_standby_enable ();/* Set chicken bit to get a reliable WAIT mode support */ imx6q_set_chicken_bit (); - ret =cpuidle_register_driver (&imx6q_cpuidle_driver); -if (ret) { -pr_err ("%s: Failed to register cpuidle driver with error: %d\n" , - __func__, ret); -return ret; - } - -/* initialize state data for each cpuidle_device */ -for_each_possible_cpu (cpu) { - dev = &per_cpu (devices, cpu); - dev->cpu = cpu; - - ret =cpuidle_register_device (dev); -if (ret) { -pr_err ("%s: Failed to register cpu %u, error: %d\n" , - __func__, cpu, ret); - goto out_unregister; - } - } - -return 0 ; - -out_unregister: -for_each_possible_cpu (cpu) { - dev = &per_cpu (devices, cpu); -cpuidle_unregister_device (dev); - } - -cpuidle_unregister_driver (&imx6q_cpuidle_driver); -return ret; +return cpuidle_register (&imx6q_cpuidle_driver,NULL ); }
Signature · 1 line
1.7.9.5