ARM: exynos: cpuidle: Move the driver to drivers/cpuidle
Subsystems (5)
v4 cover ARM: exynos: cpuidle: Move the driver to drivers/cpuidle
Changelog:
V4:
* Took into account Tomasz's comments
* Fixed missing call in for central suspend
* Passed parameter to the wakeup mask function
* Moved wakeup mask, boot vector and aftr state into a single function
* Used this function as callback for platform data
* Moved S5P_CHECK_AFTR/S5P_CHECK_SLEEP into pm.c
* Set boot vector only one time
* Splitted some patches to make them more readable
V3:
* Added patch : "ARM: exynos: cpuidle: Disable cpuidle for 5440"
* Removed patch : "ARM: exynos: config: Enable cpuidle"
* Removed default ARM_EXYNOS4210_CPUIDLE=y
* Added comment about bug fix side effect 'for_each_possible_cpu'
V2:
* Added comment in changelog for calls order (5/17)
* Call the powerdown only for cpu0 in the pm notifier
* Set the pm notifier for all boards
V1: initial post
This patchset relies on the cpm_pm notifier to initiate the powerdown sequence operations from pm.c instead cpuidle.c. Thus the cpuidle driver is no longer dependent from arch specific code as everything is called from the pm.c file.
The patchset applies on top of linux-samsung/for-next.
Tested on exynos4: 4210
Tested on exynos5: 5250 (without AFTR)
Daniel Lezcano (20):
ARM: exynos: cpuidle: Prevent forward declaration
ARM: exynos: cpuidle: Use cpuidle_register
ARM: exynos: cpuidle: Change function name prefix
ARM: exynos: cpuidle: Encapsulate register access inside a function
ARM: exynos: cpuidle: Move some code inside the idle_finisher
ARM: exynos: cpuidle: Fix S5P_WAKEUP_STAT call
ARM: exynos: cpuidle: Use the cpu_pm notifier
ARM: exynos: cpuidle: Move scu_enable in the cpu_pm notifier
ARM: exynos: cpuidle: Remove ifdef for scu_enable
ARM: exynos: cpuidle: Move clock setup to pm.c
ARM: exynos: cpuidle: Pass wakeup mask parameter to function
ARM: exynos: cpuidle: Encapsulate boot vector code into a function
ARM: exynos: cpuidle: Disable cpuidle for 5440
ARM: exynos: cpuidle: Encapsulate the AFTR code into a function
ARM: exynos: cpuidle: Move the AFTR state function into pm.c
ARM: exynos: cpuidle: Move the power sequence call in the cpu_pm
notifier
ARM: exynos: cpuidle: Move S5P_CHECK_SLEEP into pm.c
ARM: exynos: cpuidle: Pass the AFTR callback to the platform_data
ARM: exynos: cpuidle: Cleanup all unneeded headers from cpuidle.c
ARM: exynos: cpuidle: Move the driver to drivers/cpuidle directory
arch/arm/mach-exynos/Makefile | 1 - arch/arm/mach-exynos/common.h | 1 + arch/arm/mach-exynos/cpuidle.c | 255 -------------------------------------- arch/arm/mach-exynos/exynos.c | 8 +- arch/arm/mach-exynos/pm.c | 187 +++++++++++++++++++++++----- arch/arm/mach-exynos/regs-pmu.h | 21 +++- drivers/cpuidle/Kconfig.arm | 6 + drivers/cpuidle/Makefile | 1 + drivers/cpuidle/cpuidle-exynos.c | 98 +++++++++++++++ 9 files changed, 289 insertions(+), 289 deletions(-) delete mode 100644 arch/arm/mach-exynos/cpuidle.c create mode 100644 drivers/cpuidle/cpuidle-exynos.c
Signature · 1 line
1.7.9.5
PATCH v4 1/20 ARM: exynos: cpuidle: Prevent forward declaration
Move the structure below the 'exynos4_enter_lowpower' function so no more need of forward declaration.
--- arch/arm/mach-exynos/cpuidle.c | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-)
arch/arm/mach-exynos/cpuidle.c +18 -22
@@ -59,30 +59,8 @@#define PWR_CTRL2_CORE2_UP_RATIO (1 << 4)#define PWR_CTRL2_CORE1_UP_RATIO (1 << 0) -static int exynos4_enter_lowpower (struct cpuidle_device *dev, -struct cpuidle_driver *drv, -int index); - static DEFINE_PER_CPU(struct cpuidle_device, exynos4_cpuidle_device); -static struct cpuidle_driver exynos4_idle_driver = { - .name ="exynos4_idle" , - .owner =THIS_MODULE , - .states = { - [0 ] =ARM_CPUIDLE_WFI_STATE , - [1 ] = { - .enter = exynos4_enter_lowpower, - .exit_latency =300 , - .target_residency =100000 , - .flags =CPUIDLE_FLAG_TIME_VALID , - .name ="C1" , - .desc ="ARM power down" , - }, - }, - .state_count =2 , - .safe_state_index =0 , -}; -/* Ext-GIC nIRQ/nFIQ is the only wakeup source in AFTR */ static void exynos4_set_wakeupmask (void ) {
@@ -213,6 +191,24 @@ static void __init exynos5_core_down_clk(void)__raw_writel (tmp,EXYNOS5_PWR_CTRL2 ); } +static struct cpuidle_driver exynos4_idle_driver = { + .name ="exynos4_idle" , + .owner =THIS_MODULE , + .states = { + [0 ] =ARM_CPUIDLE_WFI_STATE , + [1 ] = { + .enter = exynos4_enter_lowpower, + .exit_latency =300 , + .target_residency =100000 , + .flags =CPUIDLE_FLAG_TIME_VALID , + .name ="C1" , + .desc ="ARM power down" , + }, + }, + .state_count =2 , + .safe_state_index =0 , +}; +static int exynos_cpuidle_probe (struct platform_device *pdev) {int cpu_id, ret;
Signature · 1 line
1.7.9.5
PATCH v4 2/20 ARM: exynos: cpuidle: Use cpuidle_register
In reply to Daniel LezcanoUse the cpuidle generic function 'cpuidle_register'. That saves us from some extra lines of code and unneeded variables.
A side effect of this change is a bug fix where before the cpuidle driver was registered for each_online_cpu and now it is for each_possible_cpu.
--- arch/arm/mach-exynos/cpuidle.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-)
arch/arm/mach-exynos/cpuidle.c +2 -16
@@ -59,8 +59,6 @@#define PWR_CTRL2_CORE2_UP_RATIO (1 << 4)#define PWR_CTRL2_CORE1_UP_RATIO (1 << 0) -static DEFINE_PER_CPU(struct cpuidle_device, exynos4_cpuidle_device); -/* Ext-GIC nIRQ/nFIQ is the only wakeup source in AFTR */ static void exynos4_set_wakeupmask (void ) {
@@ -211,8 +209,7 @@ static struct cpuidle_driver exynos4_idle_driver = {static int exynos_cpuidle_probe (struct platform_device *pdev) { -int cpu_id, ret; -struct cpuidle_device *device; +int ret;if (soc_is_exynos5250 ())exynos5_core_down_clk ();
@@ -220,23 +217,12 @@ static int exynos_cpuidle_probe(struct platform_device *pdev)if (soc_is_exynos5440 ()) exynos4_idle_driver.state_count =1 ; - ret =cpuidle_register_driver (&exynos4_idle_driver); + ret =cpuidle_register (&exynos4_idle_driver,NULL );if (ret) {dev_err (&pdev->dev,"failed to register cpuidle driver\n" );return ret; } -for_each_online_cpu (cpu_id) { - device = &per_cpu (exynos4_cpuidle_device, cpu_id); - device->cpu = cpu_id; - - ret =cpuidle_register_device (device); -if (ret) { -dev_err (&pdev->dev,"failed to register cpuidle device\n" ); -return ret; - } - } -return 0 ; }
Signature · 1 line
1.7.9.5
PATCH v4 3/20 ARM: exynos: cpuidle: Change function name prefix
In reply to Daniel LezcanoThe driver was initially written for exynos4 but the driver is used also for exynos5.
Change the function prefix name exynos4 -> exynos
--- arch/arm/mach-exynos/cpuidle.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
arch/arm/mach-exynos/cpuidle.c +10 -10
@@ -60,7 +60,7 @@#define PWR_CTRL2_CORE1_UP_RATIO (1 << 0)/* Ext-GIC nIRQ/nFIQ is the only wakeup source in AFTR */ -static void exynos4_set_wakeupmask (void ) +static void exynos_set_wakeupmask (void ) {__raw_writel (0x0000ff3e ,S5P_WAKEUP_MASK ); }
@@ -91,13 +91,13 @@ static int idle_finisher(unsigned long flags)return 1 ; } -static int exynos4_enter_core0_aftr (struct cpuidle_device *dev, +static int exynos_enter_core0_aftr (struct cpuidle_device *dev,struct cpuidle_driver *drv,int index) {unsigned long tmp; -exynos4_set_wakeupmask (); +exynos_set_wakeupmask ();/* Set value of power down register for aftr mode */ exynos_sys_powerdown_conf (SYS_AFTR );
@@ -141,7 +141,7 @@ static int exynos4_enter_core0_aftr(struct cpuidle_device *dev,return index; } -static int exynos4_enter_lowpower (struct cpuidle_device *dev, +static int exynos_enter_lowpower (struct cpuidle_device *dev,struct cpuidle_driver *drv,int index) {
@@ -154,7 +154,7 @@ static int exynos4_enter_lowpower(struct cpuidle_device *dev,if (new_index ==0 )return arm_cpuidle_simple_enter (dev, drv, new_index);else -return exynos4_enter_core0_aftr (dev, drv, new_index); +return exynos_enter_core0_aftr (dev, drv, new_index); }static void __init exynos5_core_down_clk (void )
@@ -189,13 +189,13 @@ static void __init exynos5_core_down_clk(void)__raw_writel (tmp,EXYNOS5_PWR_CTRL2 ); } -static struct cpuidle_driver exynos4_idle_driver = { - .name ="exynos4_idle" , +static struct cpuidle_driver exynos_idle_driver = { + .name ="exynos_idle" , .owner =THIS_MODULE , .states = { [0 ] =ARM_CPUIDLE_WFI_STATE , [1 ] = { - .enter = exynos4_enter_lowpower, + .enter = exynos_enter_lowpower, .exit_latency =300 , .target_residency =100000 , .flags =CPUIDLE_FLAG_TIME_VALID ,
@@ -215,9 +215,9 @@ static int exynos_cpuidle_probe(struct platform_device *pdev)exynos5_core_down_clk ();if (soc_is_exynos5440 ()) - exynos4_idle_driver.state_count =1 ; + exynos_idle_driver.state_count =1 ; - ret =cpuidle_register (&exynos4_idle_driver,NULL ); + ret =cpuidle_register (&exynos_idle_driver,NULL );if (ret) {dev_err (&pdev->dev,"failed to register cpuidle driver\n" );return ret;
Signature · 1 line
1.7.9.5
PATCH v4 4/20 ARM: exynos: cpuidle: Encapsulate register access inside a function
In reply to Daniel LezcanoThat makes the code cleaner and encapsulted. The function will be reused in the next patch.
--- arch/arm/mach-exynos/pm.c | 65 ++++++++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 24 deletions(-)
arch/arm/mach-exynos/pm.c +41 -24
@@ -103,6 +103,42 @@ static int exynos_irq_set_wake(struct irq_data *data, unsigned int state)/* For Cortex-A9 Diagnostic and Power control register */ static unsigned int save_arm_register[2 ]; +static void exynos_cpu_save_register (void ) +{ +unsigned long tmp; + +/* Save Power control register */ + asm ("mrc p15, 0, %0, c15, c0, 0" + :"=r" (tmp) : :"cc" ); + + save_arm_register[0 ] = tmp; + +/* Save Diagnostic register */ + asm ("mrc p15, 0, %0, c15, c0, 1" + :"=r" (tmp) : :"cc" ); + + save_arm_register[1 ] = tmp; +} + +static void exynos_cpu_restore_register (void ) +{ +unsigned long tmp; + +/* Restore Power control register */ + tmp = save_arm_register[0 ]; + + asmvolatile ("mcr p15, 0, %0, c15, c0, 0" + : :"r" (tmp) + :"cc" ); + +/* Restore Diagnostic register */ + tmp = save_arm_register[1 ]; + + asmvolatile ("mcr p15, 0, %0, c15, c0, 1" + : :"r" (tmp) + :"cc" ); +} +static int exynos_cpu_suspend (unsigned long arg) {#ifdef CONFIG_CACHE_L2X0
@@ -162,17 +198,8 @@ static int exynos_pm_suspend(void) tmp = (S5P_USE_STANDBY_WFI0 |S5P_USE_STANDBY_WFE0 );__raw_writel (tmp,S5P_CENTRAL_SEQ_OPTION ); -if (!soc_is_exynos5250 ()) { -/* Save Power control register */ - asm ("mrc p15, 0, %0, c15, c0, 0" - :"=r" (tmp) : :"cc" ); - save_arm_register[0 ] = tmp; - -/* Save Diagnostic register */ - asm ("mrc p15, 0, %0, c15, c0, 1" - :"=r" (tmp) : :"cc" ); - save_arm_register[1 ] = tmp; - } +if (!soc_is_exynos5250 ()) +exynos_cpu_save_register ();return 0 ; }
@@ -196,19 +223,9 @@ static void exynos_pm_resume(void)/* No need to perform below restore code */ goto early_wakeup; } -if (!soc_is_exynos5250 ()) { -/* Restore Power control register */ - tmp = save_arm_register[0 ]; - asmvolatile ("mcr p15, 0, %0, c15, c0, 0" - : :"r" (tmp) - :"cc" ); - -/* Restore Diagnostic register */ - tmp = save_arm_register[1 ]; - asmvolatile ("mcr p15, 0, %0, c15, c0, 1" - : :"r" (tmp) - :"cc" ); - } + +if (!soc_is_exynos5250 ()) +exynos_cpu_restore_register ();/* For release retention */
Signature · 1 line
1.7.9.5
PATCH v4 5/20 ARM: exynos: cpuidle: Move some code inside the idle_finisher
In reply to Daniel LezcanoMove the code around to differentiate different section of code and prepare it to be factored out in the next patches.
The call order changed but hat doesn't have a side effect because they are independent. The important call is cpu_do_idle() which must be done the last.
--- arch/arm/mach-exynos/cpuidle.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
arch/arm/mach-exynos/cpuidle.c +9 -8
@@ -87,7 +87,16 @@ static void restore_cpu_arch_register(void)static int idle_finisher (unsigned long flags) { +exynos_set_wakeupmask (); + +__raw_writel (virt_to_phys (s3c_cpu_resume),REG_DIRECTGO_ADDR ); +__raw_writel (S5P_CHECK_AFTR ,REG_DIRECTGO_FLAG ); + +/* Set value of power down register for aftr mode */ +exynos_sys_powerdown_conf (SYS_AFTR ); +cpu_do_idle (); +return 1 ; }
@@ -97,14 +106,6 @@ static int exynos_enter_core0_aftr(struct cpuidle_device *dev, {unsigned long tmp; -exynos_set_wakeupmask (); - -/* Set value of power down register for aftr mode */ -exynos_sys_powerdown_conf (SYS_AFTR ); - -__raw_writel (virt_to_phys (exynos_cpu_resume),REG_DIRECTGO_ADDR ); -__raw_writel (S5P_CHECK_AFTR ,REG_DIRECTGO_FLAG ); -save_cpu_arch_register ();/* Setting Central Sequence Register for power down mode */
Signature · 1 line
1.7.9.5
PATCH v4 6/20 ARM: exynos: cpuidle: Fix S5P_WAKEUP_STAT call
In reply to Daniel LezcanoThis function should be called only when the powerdown sequence fails.
Even if the current code does not hurt, by moving this line, we have the same code than the one in pm.c.
--- arch/arm/mach-exynos/cpuidle.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/arm/mach-exynos/cpuidle.c +2 -3
@@ -134,11 +134,10 @@ static int exynos_enter_core0_aftr(struct cpuidle_device *dev,if (!(tmp &S5P_CENTRAL_LOWPWR_CFG )) { tmp |=S5P_CENTRAL_LOWPWR_CFG ;__raw_writel (tmp,S5P_CENTRAL_SEQ_CONFIGURATION ); +/* Clear wakeup state register */ +__raw_writel (0x0 ,S5P_WAKEUP_STAT ); } -/* Clear wakeup state register */ -__raw_writel (0x0 ,S5P_WAKEUP_STAT ); -return index; }
Signature · 1 line
1.7.9.5
PATCH v4 7/20 ARM: exynos: cpuidle: Use the cpu_pm notifier
In reply to Daniel LezcanoUse the cpu_pm_enter/exit notifier to group some pm code inside the pm file.
The save and restore code is duplicated across pm.c and cpuidle.c. By using the cpu_pm notifier, we can factor out the routine.
--- arch/arm/mach-exynos/cpuidle.c | 24 ------------------------ arch/arm/mach-exynos/pm.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 24 deletions(-)
arch/arm/mach-exynos/cpuidle.c +0 -24
@@ -65,26 +65,6 @@ static void exynos_set_wakeupmask(void)__raw_writel (0x0000ff3e ,S5P_WAKEUP_MASK ); } -static unsigned int g_pwr_ctrl, g_diag_reg; - -static void save_cpu_arch_register (void ) -{ -/*read power control register*/ - asm("mrc p15, 0, %0, c15, c0, 0" :"=r" (g_pwr_ctrl) : :"cc" ); -/*read diagnostic register*/ - asm("mrc p15, 0, %0, c15, c0, 1" :"=r" (g_diag_reg) : :"cc" ); -return ; -} - -static void restore_cpu_arch_register (void ) -{ -/*write power control register*/ - asm("mcr p15, 0, %0, c15, c0, 0" : :"r" (g_pwr_ctrl) :"cc" ); -/*write diagnostic register*/ - asm("mcr p15, 0, %0, c15, c0, 1" : :"r" (g_diag_reg) :"cc" ); -return ; -} -static int idle_finisher (unsigned long flags) {exynos_set_wakeupmask ();
@@ -106,8 +86,6 @@ static int exynos_enter_core0_aftr(struct cpuidle_device *dev, {unsigned long tmp; -save_cpu_arch_register (); -/* Setting Central Sequence Register for power down mode */ tmp =__raw_readl (S5P_CENTRAL_SEQ_CONFIGURATION ); tmp &= ~S5P_CENTRAL_LOWPWR_CFG ;
@@ -122,8 +100,6 @@ static int exynos_enter_core0_aftr(struct cpuidle_device *dev,#endif cpu_pm_exit (); -restore_cpu_arch_register (); -/* * If PMU failed while entering sleep mode, WFI will be * ignored by PMU and then exiting cpu_do_idle().
arch/arm/mach-exynos/pm.c +29 -0
@@ -16,6 +16,7 @@#include <linux/init.h> #include <linux/suspend.h> #include <linux/syscore_ops.h> +#include <linux/cpu_pm.h> #include <linux/io.h> #include <linux/irqchip/arm-gic.h> #include <linux/err.h>
@@ -321,10 +322,38 @@ static const struct platform_suspend_ops exynos_suspend_ops = { .valid = suspend_valid_only_mem, }; +static int exynos_cpu_pm_notifier (struct notifier_block *self, +unsigned long cmd,void *v) +{ +int cpu =smp_processor_id (); + +switch (cmd) { +case CPU_PM_ENTER : +if (cpu ==0 ) { +exynos_cpu_save_register (); + } +break ; + +case CPU_PM_EXIT : +if (cpu ==0 ) { +exynos_cpu_restore_register (); + } +break ; + } + +return NOTIFY_OK ; +} + +static struct notifier_block exynos_cpu_pm_notifier_block = { + .notifier_call = exynos_cpu_pm_notifier, +}; +void __init exynos_pm_init (void ) {u32 tmp; +cpu_pm_register_notifier (&exynos_cpu_pm_notifier_block); +/* Platform-specific GIC callback */ gic_arch_extn.irq_set_wake = exynos_irq_set_wake;
Signature · 1 line
1.7.9.5
PATCH v4 8/20 ARM: exynos: cpuidle: Move scu_enable in the cpu_pm notifier
In reply to Daniel LezcanoWe make the cpuidle code less arch dependent.
--- arch/arm/mach-exynos/cpuidle.c | 6 ------ arch/arm/mach-exynos/pm.c | 4 ++++ 2 files changed, 4 insertions(+), 6 deletions(-)
arch/arm/mach-exynos/cpuidle.c +0 -6
@@ -18,7 +18,6 @@#include <linux/platform_device.h> #include <asm/proc-fns.h> -#include <asm/smp_scu.h> #include <asm/suspend.h> #include <asm/unified.h> #include <asm/cpuidle.h>
@@ -93,11 +92,6 @@ static int exynos_enter_core0_aftr(struct cpuidle_device *dev,cpu_pm_enter ();cpu_suspend (0 , idle_finisher); - -#ifdef CONFIG_SMP -if (!soc_is_exynos5250 ()) -scu_enable (S5P_VA_SCU ); -#endif cpu_pm_exit ();/*
arch/arm/mach-exynos/pm.c +4 -0
@@ -336,6 +336,10 @@ static int exynos_cpu_pm_notifier(struct notifier_block *self,case CPU_PM_EXIT :if (cpu ==0 ) { +#ifdef CONFIG_SMP +if (!soc_is_exynos5250 ()) +scu_enable (S5P_VA_SCU ); +#endif exynos_cpu_restore_register (); }break ;
Signature · 1 line
1.7.9.5
PATCH v4 9/20 ARM: exynos: cpuidle: Remove ifdef for scu_enable
In reply to Daniel LezcanoThe scu_enable function is already a noop in the scu's header file is CONFIG_SMP=n, so no need to use these macros in the code.
--- arch/arm/mach-exynos/pm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
arch/arm/mach-exynos/pm.c +1 -3
@@ -244,7 +244,7 @@ static void exynos_pm_resume(void)s3c_pm_do_restore_core (exynos_core_save,ARRAY_SIZE (exynos_core_save)); -if (IS_ENABLED (CONFIG_SMP ) && !soc_is_exynos5250 ()) +if (!soc_is_exynos5250 ())scu_enable (S5P_VA_SCU ); early_wakeup:
@@ -336,10 +336,8 @@ static int exynos_cpu_pm_notifier(struct notifier_block *self,case CPU_PM_EXIT :if (cpu ==0 ) { -#ifdef CONFIG_SMP if (!soc_is_exynos5250 ())scu_enable (S5P_VA_SCU ); -#endif exynos_cpu_restore_register (); }break ;
Signature · 1 line
1.7.9.5
PATCH v4 10/20 ARM: exynos: cpuidle: Move clock setup to pm.c
In reply to Daniel LezcanoOne more step is moving the clock ratio setting at idle time in pm.c
The macro names have been changed to be consistent with the other macros name in the file.
Note, the clock divider was working only when cpuidle was enabled because it was in its init routine. With this change, the clock divider is set in the pm's init routine, so it will also operate when the cpuidle driver is not set, which is good.
--- arch/arm/mach-exynos/cpuidle.c | 54 --------------------------------------- arch/arm/mach-exynos/pm.c | 35 +++++++++++++++++++++++++ arch/arm/mach-exynos/regs-pmu.h | 19 ++++++++++++++ 3 files changed, 54 insertions(+), 54 deletions(-)
arch/arm/mach-exynos/cpuidle.c +0 -54
@@ -39,25 +39,6 @@#define S5P_CHECK_AFTR 0xFCBA0D10 -#define EXYNOS5_PWR_CTRL1 (S5P_VA_CMU + 0x01020) -#define EXYNOS5_PWR_CTRL2 (S5P_VA_CMU + 0x01024) - -#define PWR_CTRL1_CORE2_DOWN_RATIO (7 << 28) -#define PWR_CTRL1_CORE1_DOWN_RATIO (7 << 16) -#define PWR_CTRL1_DIV2_DOWN_EN (1 << 9) -#define PWR_CTRL1_DIV1_DOWN_EN (1 << 8) -#define PWR_CTRL1_USE_CORE1_WFE (1 << 5) -#define PWR_CTRL1_USE_CORE0_WFE (1 << 4) -#define PWR_CTRL1_USE_CORE1_WFI (1 << 1) -#define PWR_CTRL1_USE_CORE0_WFI (1 << 0) - -#define PWR_CTRL2_DIV2_UP_EN (1 << 25) -#define PWR_CTRL2_DIV1_UP_EN (1 << 24) -#define PWR_CTRL2_DUR_STANDBY2_VAL (1 << 16) -#define PWR_CTRL2_DUR_STANDBY1_VAL (1 << 8) -#define PWR_CTRL2_CORE2_UP_RATIO (1 << 4) -#define PWR_CTRL2_CORE1_UP_RATIO (1 << 0) -/* Ext-GIC nIRQ/nFIQ is the only wakeup source in AFTR */ static void exynos_set_wakeupmask (void ) {
@@ -127,38 +108,6 @@ static int exynos_enter_lowpower(struct cpuidle_device *dev,return exynos_enter_core0_aftr (dev, drv, new_index); } -static void __init exynos5_core_down_clk (void ) -{ -unsigned int tmp; - -/* -* Enable arm clock down (in idle) and set arm divider -* ratios in WFI/WFE state. -*/ - tmp =PWR_CTRL1_CORE2_DOWN_RATIO | \ -PWR_CTRL1_CORE1_DOWN_RATIO | \ -PWR_CTRL1_DIV2_DOWN_EN | \ -PWR_CTRL1_DIV1_DOWN_EN | \ -PWR_CTRL1_USE_CORE1_WFE | \ -PWR_CTRL1_USE_CORE0_WFE | \ -PWR_CTRL1_USE_CORE1_WFI | \ -PWR_CTRL1_USE_CORE0_WFI ; -__raw_writel (tmp,EXYNOS5_PWR_CTRL1 ); - -/* -* Enable arm clock up (on exiting idle). Set arm divider -* ratios when not in idle along with the standby duration -* ratios. -*/ - tmp =PWR_CTRL2_DIV2_UP_EN | \ -PWR_CTRL2_DIV1_UP_EN | \ -PWR_CTRL2_DUR_STANDBY2_VAL | \ -PWR_CTRL2_DUR_STANDBY1_VAL | \ -PWR_CTRL2_CORE2_UP_RATIO | \ -PWR_CTRL2_CORE1_UP_RATIO ; -__raw_writel (tmp,EXYNOS5_PWR_CTRL2 ); -} -static struct cpuidle_driver exynos_idle_driver = { .name ="exynos_idle" , .owner =THIS_MODULE ,
@@ -181,9 +130,6 @@ static int exynos_cpuidle_probe(struct platform_device *pdev) {int ret; -if (soc_is_exynos5250 ()) -exynos5_core_down_clk (); -if (soc_is_exynos5440 ()) exynos_idle_driver.state_count =1 ;
arch/arm/mach-exynos/pm.c +35 -0
@@ -140,6 +140,38 @@ static void exynos_cpu_restore_register(void) : "cc"); } +static void __init exynos5_core_down_clk (void ) +{ +unsigned int tmp; + +/* +* Enable arm clock down (in idle) and set arm divider +* ratios in WFI/WFE state. +*/ + tmp =EXYNOS5_PWR_CTRL1_CORE2_DOWN_RATIO | \ +EXYNOS5_PWR_CTRL1_CORE1_DOWN_RATIO | \ +EXYNOS5_PWR_CTRL1_DIV2_DOWN_EN | \ +EXYNOS5_PWR_CTRL1_DIV1_DOWN_EN | \ +EXYNOS5_PWR_CTRL1_USE_CORE1_WFE | \ +EXYNOS5_PWR_CTRL1_USE_CORE0_WFE | \ +EXYNOS5_PWR_CTRL1_USE_CORE1_WFI | \ +EXYNOS5_PWR_CTRL1_USE_CORE0_WFI ; +__raw_writel (tmp,EXYNOS5_PWR_CTRL1 ); + +/* +* Enable arm clock up (on exiting idle). Set arm divider +* ratios when not in idle along with the standby duration +* ratios. +*/ + tmp =EXYNOS5_PWR_CTRL2_DIV2_UP_EN | \ +EXYNOS5_PWR_CTRL2_DIV1_UP_EN | \ +EXYNOS5_PWR_CTRL2_DUR_STANDBY2_VAL | \ +EXYNOS5_PWR_CTRL2_DUR_STANDBY1_VAL | \ +EXYNOS5_PWR_CTRL2_CORE2_UP_RATIO | \ +EXYNOS5_PWR_CTRL2_CORE1_UP_RATIO ; +__raw_writel (tmp,EXYNOS5_PWR_CTRL2 ); +} +static int exynos_cpu_suspend (unsigned long arg) {#ifdef CONFIG_CACHE_L2X0
@@ -244,6 +276,9 @@ static void exynos_pm_resume(void)s3c_pm_do_restore_core (exynos_core_save,ARRAY_SIZE (exynos_core_save)); +if (soc_is_exynos5250 ()) +exynos5_core_down_clk (); +if (!soc_is_exynos5250 ())scu_enable (S5P_VA_SCU );
arch/arm/mach-exynos/regs-pmu.h +19 -0
@@ -313,4 +313,23 @@#define EXYNOS5_OPTION_USE_RETENTION (1 << 4) +#define EXYNOS5_PWR_CTRL1 (S5P_VA_CMU + 0x01020) +#define EXYNOS5_PWR_CTRL2 (S5P_VA_CMU + 0x01024) + +#define EXYNOS5_PWR_CTRL1_CORE2_DOWN_RATIO (7 << 28) +#define EXYNOS5_PWR_CTRL1_CORE1_DOWN_RATIO (7 << 16) +#define EXYNOS5_PWR_CTRL1_DIV2_DOWN_EN (1 << 9) +#define EXYNOS5_PWR_CTRL1_DIV1_DOWN_EN (1 << 8) +#define EXYNOS5_PWR_CTRL1_USE_CORE1_WFE (1 << 5) +#define EXYNOS5_PWR_CTRL1_USE_CORE0_WFE (1 << 4) +#define EXYNOS5_PWR_CTRL1_USE_CORE1_WFI (1 << 1) +#define EXYNOS5_PWR_CTRL1_USE_CORE0_WFI (1 << 0) + +#define EXYNOS5_PWR_CTRL2_DIV2_UP_EN (1 << 25) +#define EXYNOS5_PWR_CTRL2_DIV1_UP_EN (1 << 24) +#define EXYNOS5_PWR_CTRL2_DUR_STANDBY2_VAL (1 << 16) +#define EXYNOS5_PWR_CTRL2_DUR_STANDBY1_VAL (1 << 8) +#define EXYNOS5_PWR_CTRL2_CORE2_UP_RATIO (1 << 4) +#define EXYNOS5_PWR_CTRL2_CORE1_UP_RATIO (1 << 0) +#endif /* __ASM_ARCH_REGS_PMU_H */
Signature · 1 line
1.7.9.5
PATCH v4 10/20 ARM: exynos: cpuidle: Move clock setup to pm.c
Hi Daniel,
Quoted 14 lines · Daniel Lezcano
One more step is moving the clock ratio setting at idle time in
pm.cThe macro names have been changed to be consistent with the other macros name in the file.
Note, the clock divider was working only when cpuidle was enabled because it was in its init routine. With this change, the clock divider is set in the pm's init routine, so it will also operate when the cpuidle driver is not set, which is good.
Signed-off-by Daniel Lezcano <[email protected]>Reviewed-by Viresh Kumar <[email protected]>Reviewed-by Bartlomiej Zolnierkiewicz <[email protected]>Reviewed-by Tomasz Figa <[email protected]>
Quoted 5 lines
--- arch/arm/mach-exynos/cpuidle.c | 54 --------------------------------------- arch/arm/mach-exynos/pm.c | 35 +++++++++++++++++++++++++ arch/arm/mach-exynos/regs-pmu.h | 19 ++++++++++++++ 3 files changed, 54 insertions(+), 54 deletions(-)
Sorry that I didn't mention that before, but now I recall that there was already a similar patch moving this code to Exynos5250 clock driver, which is the best place for setup of any CMU registers and a step towards removing one more static IO mapping.
Also one more thing below.
Quoted 123 lines
arch/arm/mach-exynos/cpuidle.c +0
-54@@ -39,25 +39,6 @@#define S5P_CHECK_AFTR 0xFCBA0D10 -#define EXYNOS5_PWR_CTRL1 (S5P_VA_CMU + 0x01020) -#define EXYNOS5_PWR_CTRL2 (S5P_VA_CMU + 0x01024) - -#define PWR_CTRL1_CORE2_DOWN_RATIO (7 << 28) -#define PWR_CTRL1_CORE1_DOWN_RATIO (7 << 16) -#define PWR_CTRL1_DIV2_DOWN_EN (1 << 9) -#define PWR_CTRL1_DIV1_DOWN_EN (1 << 8) -#define PWR_CTRL1_USE_CORE1_WFE (1 << 5) -#define PWR_CTRL1_USE_CORE0_WFE (1 << 4) -#define PWR_CTRL1_USE_CORE1_WFI (1 << 1) -#define PWR_CTRL1_USE_CORE0_WFI (1 << 0) - -#define PWR_CTRL2_DIV2_UP_EN (1 << 25) -#define PWR_CTRL2_DIV1_UP_EN (1 << 24) -#define PWR_CTRL2_DUR_STANDBY2_VAL (1 << 16) -#define PWR_CTRL2_DUR_STANDBY1_VAL (1 << 8) -#define PWR_CTRL2_CORE2_UP_RATIO (1 << 4) -#define PWR_CTRL2_CORE1_UP_RATIO (1 << 0) -/* Ext-GIC nIRQ/nFIQ is the only wakeup source in AFTR */ static void exynos_set_wakeupmask (void ) {@@ -127,38 +108,6 @@ static int exynos_enter_lowpower(struct cpuidle_device *dev,return exynos_enter_core0_aftr (dev, drv, new_index); } -static void __init exynos5_core_down_clk (void ) -{ -unsigned int tmp; - -/* -* Enable arm clock down (in idle) and set arm divider -* ratios in WFI/WFE state. -*/ - tmp =PWR_CTRL1_CORE2_DOWN_RATIO | \ -PWR_CTRL1_CORE1_DOWN_RATIO | \ -PWR_CTRL1_DIV2_DOWN_EN | \ -PWR_CTRL1_DIV1_DOWN_EN | \ -PWR_CTRL1_USE_CORE1_WFE | \ -PWR_CTRL1_USE_CORE0_WFE | \ -PWR_CTRL1_USE_CORE1_WFI | \ -PWR_CTRL1_USE_CORE0_WFI ; -__raw_writel (tmp,EXYNOS5_PWR_CTRL1 ); - -/* -* Enable arm clock up (on exiting idle). Set arm divider -* ratios when not in idle along with the standby duration -* ratios. -*/ - tmp =PWR_CTRL2_DIV2_UP_EN | \ -PWR_CTRL2_DIV1_UP_EN | \ -PWR_CTRL2_DUR_STANDBY2_VAL | \ -PWR_CTRL2_DUR_STANDBY1_VAL | \ -PWR_CTRL2_CORE2_UP_RATIO | \ -PWR_CTRL2_CORE1_UP_RATIO ; -__raw_writel (tmp,EXYNOS5_PWR_CTRL2 ); -} -static struct cpuidle_driver exynos_idle_driver = { .name ="exynos_idle" , .owner =THIS_MODULE ,@@ -181,9 +130,6 @@ static int exynos_cpuidle_probe(struct platform_device *pdev) {int ret; -if (soc_is_exynos5250 ()) -exynos5_core_down_clk (); -if (soc_is_exynos5440 ()) exynos_idle_driver.state_count =1 ;arch/arm/mach-exynos/pm.c +32
-0@@ -140,6 +140,38 @@ static void exynos_cpu_restore_register(void) : "cc"); } +static void __init exynos5_core_down_clk (void ) +{ +unsigned int tmp; + +/* +* Enable arm clock down (in idle) and set arm divider +* ratios in WFI/WFE state. +*/ + tmp =EXYNOS5_PWR_CTRL1_CORE2_DOWN_RATIO | \ +EXYNOS5_PWR_CTRL1_CORE1_DOWN_RATIO | \ +EXYNOS5_PWR_CTRL1_DIV2_DOWN_EN | \ +EXYNOS5_PWR_CTRL1_DIV1_DOWN_EN | \ +EXYNOS5_PWR_CTRL1_USE_CORE1_WFE | \ +EXYNOS5_PWR_CTRL1_USE_CORE0_WFE | \ +EXYNOS5_PWR_CTRL1_USE_CORE1_WFI | \ +EXYNOS5_PWR_CTRL1_USE_CORE0_WFI ; +__raw_writel (tmp,EXYNOS5_PWR_CTRL1 ); + +/* +* Enable arm clock up (on exiting idle). Set arm divider +* ratios when not in idle along with the standby duration +* ratios. +*/ + tmp =EXYNOS5_PWR_CTRL2_DIV2_UP_EN | \ +EXYNOS5_PWR_CTRL2_DIV1_UP_EN | \ +EXYNOS5_PWR_CTRL2_DUR_STANDBY2_VAL | \ +EXYNOS5_PWR_CTRL2_DUR_STANDBY1_VAL | \ +EXYNOS5_PWR_CTRL2_CORE2_UP_RATIO | \ +EXYNOS5_PWR_CTRL2_CORE1_UP_RATIO ; +__raw_writel (tmp,EXYNOS5_PWR_CTRL2 ); +} +static int exynos_cpu_suspend (unsigned long arg) {#ifdef CONFIG_CACHE_L2X0
arch/arm/mach-exynos/pm.c static void exynos_pm_resume(void) · line 281
Quoted 6 lines
arch/arm/mach-exynos/pm.c +3
-0@@ -244,6 +276,9 @@ static void exynos_pm_resume(void)s3c_pm_do_restore_core (exynos_core_save,ARRAY_SIZE (exynos_core_save)); +if (soc_is_exynos5250 ()) +exynos5_core_down_clk (); +
Originally this code was executed at system boot-up, but now it is happening on resume from sleep. Is this change desired?
Best regards,
Tomasz
PATCH v4 10/20 ARM: exynos: cpuidle: Move clock setup to pm.c
Quoted 27 lines · Tomasz Figa
Hi Daniel,
Quoted 17 lines · Daniel Lezcano
One more step is moving the clock ratio setting at idle time in
pm.cThe macro names have been changed to be consistent with the other macros name in the file.
Note, the clock divider was working only when cpuidle was enabled because it
was in its init routine. With this change, the clock divider is set in the pm's
init routine, so it will also operate when the cpuidle driver is not set, which
is good.Signed-off-by Daniel Lezcano <[email protected]>Reviewed-by Viresh Kumar <[email protected]>Reviewed-by Bartlomiej Zolnierkiewicz <[email protected]>Reviewed-by Tomasz Figa <[email protected]>Quoted 6 lines
--- arch/arm/mach-exynos/cpuidle.c | 54 --------------------------------------- arch/arm/mach-exynos/pm.c | 35 +++++++++++++++++++++++++ arch/arm/mach-exynos/regs-pmu.h | 19 ++++++++++++++ 3 files changed, 54 insertions(+), 54 deletions(-)
Quoted 4 lines
Sorry that I didn't mention that before, but now I recall that there was already a similar patch moving this code to Exynos5250 clock driver, which is the best place for setup of any CMU registers and a step towards removing one more static IO mapping.
Yes, Bartlomiej mentioned it.
Is it possible to merge this mentioned patch or to give a pointer to it so I can integrate it into the patchset ?
Quoted 2 lines
Also one more thing below.
[ ... ]
Quoted 7 lines
Quoted 7 lines
{ #ifdef CONFIG_CACHE_L2X0(quoted diff) +0
-0@@ -244,6 +276,9 @@ static void exynos_pm_resume(void) s3c_pm_do_restore_core(exynos_core_save, ARRAY_SIZE(exynos_core_save));
Quoted 6 lines
arch/arm/mach-exynos/pm.c static void exynos_pm_resume(void) · line 281
Quoted 3 lines
arch/arm/mach-exynos/pm.c +3
-0+if (soc_is_exynos5250 ()) +exynos5_core_down_clk (); +Originally this code was executed at system boot-up, but now it is happening on resume from sleep. Is this change desired?
Argh ! Sounds like I got a bad fuzz there.
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 v4 10/20 ARM: exynos: cpuidle: Move clock setup to pm.c
Quoted 33 lines · Daniel Lezcano
Quoted 27 lines · Tomasz Figa
Hi Daniel,
Quoted 17 lines · Daniel Lezcano
One more step is moving the clock ratio setting at idle time in
pm.cThe macro names have been changed to be consistent with the other macros name in the file.
Note, the clock divider was working only when cpuidle was enabled because it
was in its init routine. With this change, the clock divider is set in the pm's
init routine, so it will also operate when the cpuidle driver is not set, which
is good.Signed-off-by Daniel Lezcano <[email protected]>Reviewed-by Viresh Kumar <[email protected]>Reviewed-by Bartlomiej Zolnierkiewicz <[email protected]>Reviewed-by Tomasz Figa <[email protected]>Quoted 6 lines
--- arch/arm/mach-exynos/cpuidle.c | 54 --------------------------------------- arch/arm/mach-exynos/pm.c | 35 +++++++++++++++++++++++++ arch/arm/mach-exynos/regs-pmu.h | 19 ++++++++++++++ 3 files changed, 54 insertions(+), 54 deletions(-)Quoted 4 lines
Sorry that I didn't mention that before, but now I recall that there was already a similar patch moving this code to Exynos5250 clock driver, which is the best place for setup of any CMU registers and a step towards removing one more static IO mapping.
Quoted 4 lines
Yes, Bartlomiej mentioned it.
Is it possible to merge this mentioned patch or to give a pointer to it so I can integrate it into the patchset ?
http://marc.info/?l=linux-arm-kernel&m=138147021207626&w=2
I wonder if it still applies cleanly, though...
Best regards,
Tomasz
PATCH v4 10/20 ARM: exynos: cpuidle: Move clock setup to pm.c
Quoted 35 lines · Tomasz Figa
Quoted 34 lines · Daniel Lezcano
Quoted 32 lines · Tomasz Figa
Hi Daniel,
Quoted 18 lines · Daniel Lezcano
One more step is moving the clock ratio setting at idle time in
pm.cThe macro names have been changed to be consistent with the other macros
name in the file.Note, the clock divider was working only when cpuidle was enabled because it
was in its init routine. With this change, the clock divider is set in the pm's
init routine, so it will also operate when the cpuidle driver is not set, which
is good.Signed-off-by Daniel Lezcano <[email protected]>Reviewed-by Viresh Kumar <[email protected]>Reviewed-by Bartlomiej Zolnierkiewicz <[email protected]>Reviewed-by Tomasz Figa <[email protected]>Quoted 6 lines
--- arch/arm/mach-exynos/cpuidle.c | 54 --------------------------------------- arch/arm/mach-exynos/pm.c | 35 +++++++++++++++++++++++++ arch/arm/mach-exynos/regs-pmu.h | 19 ++++++++++++++ 3 files changed, 54 insertions(+), 54 deletions(-)Sorry that I didn't mention that before, but now I recall that there was already a similar patch moving this code to Exynos5250 clock driver, which is the best place for setup of any CMU registers and a step towards removing one more static IO mapping.
Quoted 8 lines
Quoted 4 lines
Yes, Bartlomiej mentioned it.
Is it possible to merge this mentioned patch or to give a pointer to it so I can integrate it into the patchset ?
http://marc.info/?l=linux-arm-kernel&m=138147021207626&w=2
I wonder if it still applies cleanly, though...
Ok, if I refer to the date, this patch has been lost in the limbus. So I can integrate it with my patchset without conflicting with any tree. Right ?
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 v4 10/20 ARM: exynos: cpuidle: Move clock setup to pm.c
Quoted 42 lines · Daniel Lezcano
Quoted 41 lines · Tomasz Figa
Quoted 39 lines · Daniel Lezcano
Quoted 28 lines · Tomasz Figa
Hi Daniel,
Quoted 18 lines · Daniel Lezcano
One more step is moving the clock ratio setting at idle time in
pm.cThe macro names have been changed to be consistent with the other macros
name in the file.Note, the clock divider was working only when cpuidle was enabled because it
was in its init routine. With this change, the clock divider is set in the pm's
init routine, so it will also operate when the cpuidle driver is not set, which
is good.Signed-off-by Daniel Lezcano <[email protected]>Reviewed-by Viresh Kumar <[email protected]>Reviewed-by Bartlomiej Zolnierkiewicz <[email protected]>Reviewed-by Tomasz Figa <[email protected]>Quoted 6 lines
--- arch/arm/mach-exynos/cpuidle.c | 54 --------------------------------------- arch/arm/mach-exynos/pm.c | 35 +++++++++++++++++++++++++ arch/arm/mach-exynos/regs-pmu.h | 19 ++++++++++++++ 3 files changed, 54 insertions(+), 54 deletions(-)Quoted 5 lines
Sorry that I didn't mention that before, but now I recall that there was
already a similar patch moving this code to Exynos5250 clock driver, which is the best place for setup of any CMU registers and a step towards removing one more static IO mapping.Yes, Bartlomiej mentioned it.
Is it possible to merge this mentioned patch or to give a pointer to it so I can integrate it into the patchset ?
Quoted 8 lines
Quoted 3 lines
http://marc.info/?l=linux-arm-kernel&m=138147021207626&w=2
I wonder if it still applies cleanly, though...
Ok, if I refer to the date, this patch has been lost in the limbus. So I can integrate it with my patchset without conflicting with any tree. Right ?
As I suspected, it doesn't apply onto current sources. I have attached a rebased version. Feel free to send it as a part of next version of your series.
Best regards,
Tomasz
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-ARM-EXYNOS-Move-arm-core-power-down-clock-to-exynos5.patch
Type: text/x-patch
Size: 6226 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140411/1ad9e7d6/attachment.bin>
PATCH v4 10/20 ARM: exynos: cpuidle: Move clock setup to pm.c
Quoted 48 lines · Tomasz Figa
Quoted 47 lines · Daniel Lezcano
Quoted 45 lines · Tomasz Figa
Quoted 36 lines · Daniel Lezcano
Quoted 29 lines · Tomasz Figa
Hi Daniel,
Quoted 19 lines · Daniel Lezcano
One more step is moving the clock ratio setting at idle time in
pm.cThe macro names have been changed to be consistent with the other macros
name in the file.Note, the clock divider was working only when cpuidle was enabled because it
was in its init routine. With this change, the clock divider is set in
the pm's
init routine, so it will also operate when the cpuidle driver is not set, which
is good.Signed-off-by Daniel Lezcano <[email protected]>Reviewed-by Viresh Kumar <[email protected]>Reviewed-by Bartlomiej Zolnierkiewicz <[email protected]>Reviewed-by Tomasz Figa <[email protected]>Quoted 6 lines
--- arch/arm/mach-exynos/cpuidle.c | 54 --------------------------------------- arch/arm/mach-exynos/pm.c | 35 +++++++++++++++++++++++++ arch/arm/mach-exynos/regs-pmu.h | 19 ++++++++++++++ 3 files changed, 54 insertions(+), 54 deletions(-)Quoted 5 lines
Sorry that I didn't mention that before, but now I recall that there was
already a similar patch moving this code to Exynos5250 clock driver, which is the best place for setup of any CMU registers and a step towards removing one more static IO mapping.Quoted 4 lines
Yes, Bartlomiej mentioned it.
Is it possible to merge this mentioned patch or to give a pointer to it so I can integrate it into the patchset ?
http://marc.info/?l=linux-arm-kernel&m=138147021207626&w=2
I wonder if it still applies cleanly, though...
Quoted 8 lines
Quoted 4 lines
Ok, if I refer to the date, this patch has been lost in the limbus. So I can integrate it with my patchset without conflicting with any tree. Right ?
As I suspected, it doesn't apply onto current sources. I have attached a rebased version. Feel free to send it as a part of next version of your series.
Thanks Tomasz !
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 v4 11/20 ARM: exynos: cpuidle: Pass wakeup mask parameter to function
In reply to Daniel LezcanoPass the wakeup mask to 'exynos_set_wakeupmask' as this function could be used for different idle states with different mask.
--- arch/arm/mach-exynos/cpuidle.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-exynos/cpuidle.c +3 -3
@@ -40,14 +40,14 @@#define S5P_CHECK_AFTR 0xFCBA0D10/* Ext-GIC nIRQ/nFIQ is the only wakeup source in AFTR */ -static void exynos_set_wakeupmask (void ) +static void exynos_set_wakeupmask (long mask) { -__raw_writel (0x0000ff3e ,S5P_WAKEUP_MASK ); +__raw_writel (mask,S5P_WAKEUP_MASK ); }static int idle_finisher (unsigned long flags) { -exynos_set_wakeupmask (); +exynos_set_wakeupmask (0x0000ff3e );__raw_writel (virt_to_phys (s3c_cpu_resume),REG_DIRECTGO_ADDR );__raw_writel (S5P_CHECK_AFTR ,REG_DIRECTGO_FLAG );
Signature · 1 line
1.7.9.5
PATCH v4 12/20 ARM: exynos: cpuidle: Encapsulate boot vector code into a function
In reply to Daniel Lezcano--- arch/arm/mach-exynos/cpuidle.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
arch/arm/mach-exynos/cpuidle.c +7 -4
@@ -45,13 +45,16 @@ static void exynos_set_wakeupmask(long mask)__raw_writel (mask,S5P_WAKEUP_MASK ); } +static void exynos_cpu_set_boot_vector (long flags) +{ +__raw_writel (virt_to_phys (exynos_cpu_resume),REG_DIRECTGO_ADDR ); +__raw_writel (flags,REG_DIRECTGO_FLAG ); +} +static int idle_finisher (unsigned long flags) {exynos_set_wakeupmask (0x0000ff3e ); - -__raw_writel (virt_to_phys (s3c_cpu_resume),REG_DIRECTGO_ADDR ); -__raw_writel (S5P_CHECK_AFTR ,REG_DIRECTGO_FLAG ); - +exynos_cpu_set_boot_vector (S5P_CHECK_AFTR );/* Set value of power down register for aftr mode */ exynos_sys_powerdown_conf (SYS_AFTR );
Signature · 1 line
1.7.9.5
PATCH v4 13/20 ARM: exynos: cpuidle: Disable cpuidle for 5440
In reply to Daniel LezcanoThere is no point to register the cpuidle driver for the 5440 as it has only one WFI state which is the default idle function when the cpuidle driver is disabled.
By disabling cpuidle we prevent to enter to the governor computation for nothing, thus saving a lot of processing time.
The only drawback is the statistic via sysfs on this state which is lost but it is meaningless and it could be retrieved from the ftrace easily.
--- arch/arm/mach-exynos/cpuidle.c | 3 --- arch/arm/mach-exynos/exynos.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-exynos/cpuidle.c +0 -3
@@ -133,9 +133,6 @@ static int exynos_cpuidle_probe(struct platform_device *pdev) {int ret; -if (soc_is_exynos5440 ()) - exynos_idle_driver.state_count =1 ; - ret =cpuidle_register (&exynos_idle_driver,NULL );if (ret) {dev_err (&pdev->dev,"failed to register cpuidle driver\n" );
arch/arm/mach-exynos/exynos.c +3 -0
@@ -227,6 +227,9 @@ static struct platform_device exynos_cpuidle = {void __init exynos_cpuidle_init (void ) { +if (soc_is_exynos5440 ()) +return ; +platform_device_register (&exynos_cpuidle); }
Signature · 1 line
1.7.9.5
PATCH v4 14/20 ARM: exynos: cpuidle: Encapsulate the AFTR code into a function
In reply to Daniel LezcanoLet's encapsulate the AFTR state specific call into a single function.
--- arch/arm/mach-exynos/cpuidle.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/arm/mach-exynos/cpuidle.c +5 -1
@@ -51,13 +51,17 @@ static void exynos_cpu_set_boot_vector(long flags)__raw_writel (flags,REG_DIRECTGO_FLAG ); } -static int idle_finisher (unsigned long flags) +static void exynos_enter_aftr (void ) {exynos_set_wakeupmask (0x0000ff3e );exynos_cpu_set_boot_vector (S5P_CHECK_AFTR );/* Set value of power down register for aftr mode */ exynos_sys_powerdown_conf (SYS_AFTR ); +} +static int idle_finisher (unsigned long flags) +{ +exynos_enter_aftr ();cpu_do_idle ();return 1 ;
Signature · 1 line
1.7.9.5
PATCH v4 15/20 ARM: exynos: cpuidle: Move the AFTR state function into pm.c
In reply to Daniel LezcanoIn order to remove depedency on pm code, let's move the 'exynos_enter_aftr' function into the pm.c file as well as the other helper functions.
--- arch/arm/mach-exynos/common.h | 1 + arch/arm/mach-exynos/cpuidle.c | 29 ----------------------------- arch/arm/mach-exynos/pm.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 29 deletions(-)
arch/arm/mach-exynos/common.h +1 -0
@@ -62,5 +62,6 @@ struct exynos_pmu_conf { };extern void exynos_sys_powerdown_conf (enum sys_powerdown mode); +extern void exynos_enter_aftr (void );#endif /* __ARCH_ARM_MACH_EXYNOS_COMMON_H */
arch/arm/mach-exynos/cpuidle.c +0 -29
@@ -30,35 +30,6 @@#include "common.h" #include "regs-pmu.h" -#define REG_DIRECTGO_ADDR (samsung_rev() == EXYNOS4210_REV_1_1 ? \ - S5P_INFORM7 : (samsung_rev() == EXYNOS4210_REV_1_0 ? \ - (S5P_VA_SYSRAM + 0x24) : S5P_INFORM0)) -#define REG_DIRECTGO_FLAG (samsung_rev() == EXYNOS4210_REV_1_1 ? \ - S5P_INFORM6 : (samsung_rev() == EXYNOS4210_REV_1_0 ? \ - (S5P_VA_SYSRAM + 0x20) : S5P_INFORM1)) - -#define S5P_CHECK_AFTR 0xFCBA0D10 - -/* Ext-GIC nIRQ/nFIQ is the only wakeup source in AFTR */ -static void exynos_set_wakeupmask (long mask) -{ -__raw_writel (mask,S5P_WAKEUP_MASK ); -} - -static void exynos_cpu_set_boot_vector (long flags) -{ -__raw_writel (virt_to_phys (exynos_cpu_resume),REG_DIRECTGO_ADDR ); -__raw_writel (flags,REG_DIRECTGO_FLAG ); -} - -static void exynos_enter_aftr (void ) -{ -exynos_set_wakeupmask (0x0000ff3e ); -exynos_cpu_set_boot_vector (S5P_CHECK_AFTR ); -/* Set value of power down register for aftr mode */ -exynos_sys_powerdown_conf (SYS_AFTR ); -} -static int idle_finisher (unsigned long flags) {exynos_enter_aftr ();
arch/arm/mach-exynos/pm.c +29 -0
@@ -101,6 +101,35 @@ static int exynos_irq_set_wake(struct irq_data *data, unsigned int state)return -ENOENT ; } +#define EXYNOS_BOOT_VECTOR_ADDR (samsung_rev() == EXYNOS4210_REV_1_1 ? \ + S5P_INFORM7 : (samsung_rev() == EXYNOS4210_REV_1_0 ? \ + (S5P_VA_SYSRAM + 0x24) : S5P_INFORM0)) +#define EXYNOS_BOOT_VECTOR_FLAG (samsung_rev() == EXYNOS4210_REV_1_1 ? \ + S5P_INFORM6 : (samsung_rev() == EXYNOS4210_REV_1_0 ? \ + (S5P_VA_SYSRAM + 0x20) : S5P_INFORM1)) + +#define S5P_CHECK_AFTR 0xFCBA0D10 + +/* Ext-GIC nIRQ/nFIQ is the only wakeup source in AFTR */ +static void exynos_set_wakeupmask (long mask) +{ +__raw_writel (mask,S5P_WAKEUP_MASK ); +} + +static void exynos_cpu_set_boot_vector (long flags) +{ +__raw_writel (virt_to_phys (exynos_cpu_resume),EXYNOS_BOOT_VECTOR_ADDR ); +__raw_writel (flags,EXYNOS_BOOT_VECTOR_FLAG ); +} + +void exynos_enter_aftr (void ) +{ +exynos_set_wakeupmask (0x0000ff3e ); +exynos_cpu_set_boot_vector (S5P_CHECK_AFTR ); +/* Set value of power down register for aftr mode */ +exynos_sys_powerdown_conf (SYS_AFTR ); +} +/* For Cortex-A9 Diagnostic and Power control register */ static unsigned int save_arm_register[2 ];
Signature · 1 line
1.7.9.5
PATCH v4 16/20 ARM: exynos: cpuidle: Move the power sequence call in the cpu_pm notifier
In reply to Daniel LezcanoThe code to initiate and exit the powerdown sequence is the same in pm.c and cpuidle.c.
Let's split the common part in the pm.c and reuse it from the cpu_pm notifier.
That is one more step forward to make the cpuidle driver arch indenpendant.
--- arch/arm/mach-exynos/cpuidle.c | 22 ---------------------- arch/arm/mach-exynos/pm.c | 24 ++++++++++++++++++++---- 2 files changed, 20 insertions(+), 26 deletions(-)
arch/arm/mach-exynos/cpuidle.c +0 -22
@@ -28,7 +28,6 @@#include <mach/map.h> #include "common.h" -#include "regs-pmu.h" static int idle_finisher (unsigned long flags) {
@@ -42,31 +41,10 @@ static int exynos_enter_core0_aftr(struct cpuidle_device *dev,struct cpuidle_driver *drv, int index) { -unsigned long tmp; - -/* Setting Central Sequence Register for power down mode */ - tmp =__raw_readl (S5P_CENTRAL_SEQ_CONFIGURATION ); - tmp &= ~S5P_CENTRAL_LOWPWR_CFG ; -__raw_writel (tmp,S5P_CENTRAL_SEQ_CONFIGURATION ); -cpu_pm_enter ();cpu_suspend (0 , idle_finisher);cpu_pm_exit (); -/* -* If PMU failed while entering sleep mode, WFI will be -* ignored by PMU and then exiting cpu_do_idle(). -* S5P_CENTRAL_LOWPWR_CFG bit will not be set automatically -* in this situation. -*/ - tmp =__raw_readl (S5P_CENTRAL_SEQ_CONFIGURATION ); -if (!(tmp &S5P_CENTRAL_LOWPWR_CFG )) { - tmp |=S5P_CENTRAL_LOWPWR_CFG ; -__raw_writel (tmp,S5P_CENTRAL_SEQ_CONFIGURATION ); -/* Clear wakeup state register */ -__raw_writel (0x0 ,S5P_WAKEUP_STAT ); - } -return index; }
arch/arm/mach-exynos/pm.c +20 -4
@@ -245,15 +245,21 @@ static void exynos_pm_prepare(void)__raw_writel (virt_to_phys (exynos_cpu_resume),S5P_INFORM0 ); } -static int exynos_pm_suspend (void ) +static void exynos_pm_central_suspend (void ) {unsigned long tmp;/* Setting Central Sequence Register for power down mode */ - tmp =__raw_readl (S5P_CENTRAL_SEQ_CONFIGURATION ); tmp &= ~S5P_CENTRAL_LOWPWR_CFG ;__raw_writel (tmp,S5P_CENTRAL_SEQ_CONFIGURATION ); +} + +static int exynos_pm_suspend (void ) +{ +unsigned long tmp; + +exynos_pm_central_suspend ();/* Setting SEQ_OPTION register */
@@ -266,7 +272,7 @@ static int exynos_pm_suspend(void)return 0 ; } -static void exynos_pm_resume (void ) +static int exynos_pm_central_resume (void ) {unsigned long tmp;
@@ -283,9 +289,17 @@ static void exynos_pm_resume(void)/* clear the wakeup state register */ __raw_writel (0x0 ,S5P_WAKEUP_STAT );/* No need to perform below restore code */ - goto early_wakeup; +return -1 ; } +return 0 ; +} + +static void exynos_pm_resume (void ) +{ +if (exynos_pm_central_resume ()) + goto early_wakeup; +if (!soc_is_exynos5250 ())exynos_cpu_restore_register ();
@@ -394,6 +408,7 @@ static int exynos_cpu_pm_notifier(struct notifier_block *self,switch (cmd) {case CPU_PM_ENTER :if (cpu ==0 ) { +exynos_pm_central_suspend ();exynos_cpu_save_register (); }break ;
@@ -403,6 +418,7 @@ static int exynos_cpu_pm_notifier(struct notifier_block *self,if (!soc_is_exynos5250 ())scu_enable (S5P_VA_SCU );exynos_cpu_restore_register (); +exynos_pm_central_resume (); }break ; }
Signature · 1 line
1.7.9.5
PATCH v4 17/20 ARM: exynos: cpuidle: Move S5P_CHECK_SLEEP into pm.c
In reply to Daniel LezcanoThis macro is only used there.
--- arch/arm/mach-exynos/pm.c | 3 ++- arch/arm/mach-exynos/regs-pmu.h | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-)
arch/arm/mach-exynos/pm.c +2 -1
@@ -108,7 +108,8 @@ static int exynos_irq_set_wake(struct irq_data *data, unsigned int state) S5P_INFORM6 : (samsung_rev() == EXYNOS4210_REV_1_0 ? \ (S5P_VA_SYSRAM + 0x20) : S5P_INFORM1)) -#define S5P_CHECK_AFTR 0xFCBA0D10 +#define S5P_CHECK_AFTR 0xFCBA0D10 +#define S5P_CHECK_SLEEP 0x00000BAD/* Ext-GIC nIRQ/nFIQ is the only wakeup source in AFTR */ static void exynos_set_wakeupmask (long mask)
arch/arm/mach-exynos/regs-pmu.h +0 -2
@@ -119,8 +119,6 @@#define S5P_CORE_LOCAL_PWR_EN 0x3#define S5P_INT_LOCAL_PWR_EN 0x7 -#define S5P_CHECK_SLEEP 0x00000BAD -/* Only for EXYNOS4210 */ #define S5P_CMU_CLKSTOP_LCD1_LOWPWR S5P_PMUREG(0x1154)#define S5P_CMU_RESET_LCD1_LOWPWR S5P_PMUREG(0x1174)
Signature · 1 line
1.7.9.5
PATCH v4 18/20 ARM: exynos: cpuidle: Pass the AFTR callback to the platform_data
In reply to Daniel LezcanoNo more dependency on the arch code. The platform_data field is used to set the PM callback as the other cpuidle drivers.
--- arch/arm/mach-exynos/cpuidle.c | 4 +++- arch/arm/mach-exynos/exynos.c | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-)
arch/arm/mach-exynos/cpuidle.c +3 -1
@@ -27,7 +27,7 @@#include <mach/map.h> -#include "common.h" +static void (*exynos_enter_aftr)(void );static int idle_finisher (unsigned long flags) {
@@ -86,6 +86,8 @@ static int exynos_cpuidle_probe(struct platform_device *pdev) {int ret; + exynos_enter_aftr = (void *)(pdev->dev.platform_data); + ret =cpuidle_register (&exynos_idle_driver,NULL );if (ret) {dev_err (&pdev->dev,"failed to register cpuidle driver\n" );
arch/arm/mach-exynos/exynos.c +3 -2
@@ -221,8 +221,9 @@ void exynos_restart(enum reboot_mode mode, const char *cmd) }static struct platform_device exynos_cpuidle = { - .name ="exynos_cpuidle" , - .id =-1 , + .name ="exynos_cpuidle" , + .dev.platform_data = exynos_enter_aftr, + .id =-1 , };void __init exynos_cpuidle_init (void )
Signature · 1 line
1.7.9.5
PATCH v4 19/20 ARM: exynos: cpuidle: Cleanup all unneeded headers from cpuidle.c
In reply to Daniel Lezcano--- arch/arm/mach-exynos/cpuidle.c | 10 ---------- 1 file changed, 10 deletions(-)
arch/arm/mach-exynos/cpuidle.c +0 -10
@@ -8,25 +8,15 @@* published by the Free Software Foundation. */ -#include <linux/kernel.h> -#include <linux/init.h> #include <linux/cpuidle.h> #include <linux/cpu_pm.h> -#include <linux/io.h> #include <linux/export.h> -#include <linux/time.h> #include <linux/platform_device.h> #include <asm/proc-fns.h> #include <asm/suspend.h> -#include <asm/unified.h> #include <asm/cpuidle.h> -#include <plat/cpu.h> -#include <plat/pm.h> - -#include <mach/map.h> -static void (*exynos_enter_aftr)(void );static int idle_finisher (unsigned long flags)
Signature · 1 line
1.7.9.5
PATCH v4 20/20 ARM: exynos: cpuidle: Move the driver to drivers/cpuidle directory
In reply to Daniel Lezcano--- arch/arm/mach-exynos/Makefile | 1 - drivers/cpuidle/Kconfig.arm | 6 ++++++ drivers/cpuidle/Makefile | 1 + .../cpuidle.c => drivers/cpuidle/cpuidle-exynos.c | 0 4 files changed, 7 insertions(+), 1 deletion(-) rename arch/arm/mach-exynos/cpuidle.c => drivers/cpuidle/cpuidle-exynos.c (100%)
arch/arm/mach-exynos/Makefile +0 -1
@@ -16,7 +16,6 @@ obj-$(CONFIG_ARCH_EXYNOS) += exynos.o obj-$(CONFIG_PM_SLEEP) += pm.o sleep.o obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o -obj-$(CONFIG_CPU_IDLE) += cpuidle.o obj-$(CONFIG_ARCH_EXYNOS) += pmu.o
drivers/cpuidle/Kconfig.arm +6 -0
@@ -44,3 +44,9 @@ config ARM_AT91_CPUIDLE depends on ARCH_AT91 help Select this to enable cpuidle for AT91 processors + +config ARM_EXYNOS_CPUIDLE + bool "Cpu Idle Driver for the Exynos processors" + depends on ARCH_EXYNOS + help + Select this to enable cpuidle for Exynos processors
drivers/cpuidle/Makefile +1 -0
@@ -13,6 +13,7 @@ obj-$(CONFIG_ARM_KIRKWOOD_CPUIDLE) += cpuidle-kirkwood.o obj-$(CONFIG_ARM_ZYNQ_CPUIDLE) += cpuidle-zynq.o obj-$(CONFIG_ARM_U8500_CPUIDLE) += cpuidle-ux500.o obj-$(CONFIG_ARM_AT91_CPUIDLE) += cpuidle-at91.o +obj-$(CONFIG_ARM_EXYNOS_CPUIDLE) += cpuidle-exynos.o ############################################################################### # POWERPC drivers
drivers/cpuidle/cpuidle-exynos.c renamed from arch/arm/mach-exynos/cpuidle.c +0 -0
Signature · 1 line
1.7.9.5