OMAP4: PM: Use the low-power state change feature on OMAP4
PATCH v2 1/5 OMAP4: PM: Use the low-power state change feature on OMAP4
For pwrdm's which support LOWPOWERSTATECHANGE, do not try waking up the domain to put it back to deeper sleep state.
---
Changes in v2:
Changed implementation for better readability and code reuse as suggested here
http://marc.info/?l=linux-omap&m=129245686306262&w=2
The below branch is updated with this version of the patchgit://gitorious.org/omap-pm/linux.git for_2.6.38/power
arch/arm/mach-omap2/pm.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-)
arch/arm/mach-omap2/pm.c +22 -6
@@ -89,6 +89,10 @@ } } +/* Types of sleep_switch used in omap_set_pwrdm_state */ +#define FORCEWAKEUP_SWITCH 0 +#define LOWPOWERSTATE_SWITCH 1 +/* * This sets pwrdm state (other than mpu & core. Currently only ON & * RET are supported. Function is assuming that clkdm doesn't have
@@ -114,9 +118,14 @@return ret;if (pwrdm_read_pwrst (pwrdm) <PWRDM_POWER_ON ) { -omap2_clkdm_wakeup (pwrdm->pwrdm_clkdms[0 ]); - sleep_switch =1 ; -pwrdm_wait_transition (pwrdm); +if ((pwrdm_read_pwrst (pwrdm) > state) && + (pwrdm->flags &PWRDM_HAS_LOWPOWERSTATECHANGE )) { + sleep_switch =LOWPOWERSTATE_SWITCH ; + }else { +omap2_clkdm_wakeup (pwrdm->pwrdm_clkdms[0 ]); +pwrdm_wait_transition (pwrdm); + sleep_switch =FORCEWAKEUP_SWITCH ; + } } ret =pwrdm_set_next_pwrst (pwrdm, state);
@@ -126,12 +135,19 @@ goto err; } -if (sleep_switch) { +switch (sleep_switch) { +case FORCEWAKEUP_SWITCH :omap2_clkdm_allow_idle (pwrdm->pwrdm_clkdms[0 ]); -pwrdm_wait_transition (pwrdm); -pwrdm_state_switch (pwrdm); +break ; +case LOWPOWERSTATE_SWITCH : +pwrdm_set_lowpwrstchange (pwrdm); +break ; +default : +return ret; } +pwrdm_wait_transition (pwrdm); +pwrdm_state_switch (pwrdm); err:return ret; }
PATCH v2 2/5 OMAP4: PM: Do not assume clkdm supports hw transitions
omap_set_pwrdm_state today assumes a clkdm supports hw_auto transitions and hence leaves some which do not support this in sw wkup state preventing low power transitions.
---
Changes in v2:
Rebased the patch on the previous patch in the series
The below branch is updated with this version of the patchgit://gitorious.org/omap-pm/linux.git for_2.6.38/power
arch/arm/mach-omap2/pm.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/pm.c +5 -3
@@ -95,8 +95,7 @@/* * This sets pwrdm state (other than mpu & core. Currently only ON & -* RET are supported. Function is assuming that clkdm doesn't have -* hw_sup mode enabled. +* RET are supported. */ int omap_set_pwrdm_state (struct powerdomain *pwrdm,u32 state) {
@@ -137,7 +136,10 @@switch (sleep_switch) {case FORCEWAKEUP_SWITCH : -omap2_clkdm_allow_idle (pwrdm->pwrdm_clkdms[0 ]); +if (pwrdm->pwrdm_clkdms[0 ]->flags &CLKDM_CAN_ENABLE_AUTO ) +omap2_clkdm_allow_idle (pwrdm->pwrdm_clkdms[0 ]); +else +omap2_clkdm_sleep (pwrdm->pwrdm_clkdms[0 ]);break ;case LOWPOWERSTATE_SWITCH :pwrdm_set_lowpwrstchange (pwrdm);
PATCH v2 1/5 OMAP4: PM: Use the low-power state change feature on OMAP4
In reply to Rajendra NayakQuoted 8 lines · Rajendra Nayak
For pwrdm's which support LOWPOWERSTATECHANGE, do not try waking up the domain to put it back to deeper sleep state.
Signed-off-by Rajendra Nayak <[email protected]>Signed-off-by Santosh Shilimkar <[email protected]>Acked-by Benoit Cousson <[email protected]>Cc Kevin Hilman <[email protected]>Cc Paul Walmsley <[email protected]>
Quoted 68 lines
---
Changes in v2:
Changed implementation for better readability and code reuse as suggested here
http://marc.info/?l=linux-omap&m=129245686306262&w=2The below branch is updated with this version of the patch
git://gitorious.org/omap-pm/linux.gitfor_2.6.38/powerarch/arm/mach-omap2/pm.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-)Index:
linux/arch/arm/mach-omap2/pm.c
===================================================================arch/arm/mach-omap2/pm.c +22
-6@@ -89,6 +89,10 @@ } } +/* Types of sleep_switch used in omap_set_pwrdm_state */ +#define FORCEWAKEUP_SWITCH 0 +#define LOWPOWERSTATE_SWITCH 1 +/* * This sets pwrdm state (other than mpu & core. Currently only ON & * RET are supported. Function is assuming that clkdm doesn't have @@ -114,9 +118,14 @@return ret;if (pwrdm_read_pwrst (pwrdm) <PWRDM_POWER_ON ) { -omap2_clkdm_wakeup (pwrdm->pwrdm_clkdms[0 ]); - sleep_switch =1 ; -pwrdm_wait_transition (pwrdm); +if ((pwrdm_read_pwrst (pwrdm) > state) && + (pwrdm->flags &PWRDM_HAS_LOWPOWERSTATECHANGE )) { + sleep_switch =LOWPOWERSTATE_SWITCH ; + }else { +omap2_clkdm_wakeup (pwrdm->pwrdm_clkdms[0 ]); +pwrdm_wait_transition (pwrdm); + sleep_switch =FORCEWAKEUP_SWITCH ; + } } ret =pwrdm_set_next_pwrst (pwrdm, state);@@ -126,12 +135,19 @@ goto err; } -if (sleep_switch) { +switch (sleep_switch) { +case FORCEWAKEUP_SWITCH :omap2_clkdm_allow_idle (pwrdm->pwrdm_clkdms[0 ]); -pwrdm_wait_transition (pwrdm); -pwrdm_state_switch (pwrdm); +break ; +case LOWPOWERSTATE_SWITCH : +pwrdm_set_lowpwrstchange (pwrdm); +break ; +default : +return ret; } +pwrdm_wait_transition (pwrdm); +pwrdm_state_switch (pwrdm); err:return ret; }