PM : cpuidle - update statistics for correct state
PATCH 1/1 PM : cpuidle - update statistics for correct state
When 'enable_off_mode' is 0, the target power state for MPU and Core is locally changed to PWRDM_POWER_RET but, the statistics are updated for idle state originally selected by the governor.
This patch 'invalidates' the idle states that lead either of MPU or Core to PWRDM_POWER_OFF state when 'enable_off_mode' is '0'. The states are valid once 'enable_off_mode' is set to '1'.
--- arch/arm/mach-omap2/cpuidle34xx.c | 34 +++++++++++++++++++++++++++------- arch/arm/mach-omap2/pm.h | 2 ++ arch/arm/mach-omap2/pm34xx.c | 2 ++ 3 files changed, 31 insertions(+), 7 deletions(-)
arch/arm/mach-omap2/cpuidle34xx.c +27 -7
@@ -104,13 +104,6 @@ static int omap3_enter_idle(struct cpuidle_device *dev,local_irq_disable ();local_fiq_disable (); -if (!enable_off_mode) { -if (mpu_state <PWRDM_POWER_RET ) - mpu_state =PWRDM_POWER_RET ; -if (core_state <PWRDM_POWER_RET ) - core_state =PWRDM_POWER_RET ; - } -pwrdm_set_next_pwrst (mpu_pd, mpu_state);pwrdm_set_next_pwrst (core_pd, core_state);
@@ -254,6 +247,31 @@ void omap_init_power_states(void)CPUIDLE_FLAG_CHECK_BM ; } +/** +* omap3_cpuidle_update_states - Update the cpuidle states. +* +* Currently, this function toggles the validity of idle states based upon +* the flag 'enable_off_mode'. When the flag is set all states are valid. +* Else, states leading to OFF state set to be invalid. +*/ +void omap3_cpuidle_update_states (void ) +{ +int i; + +for (i =OMAP3_STATE_C1 ; i <OMAP3_MAX_STATES ; i++) { +if (enable_off_mode) { + omap3_power_states[i].valid =1 ; + } +else { +if ((omap3_power_states[i].mpu_state + ==PWRDM_POWER_OFF ) + || (omap3_power_states[i].core_state + ==PWRDM_POWER_RET )) + omap3_power_states[i].valid =0 ; + } + } +} +struct cpuidle_driver omap3_idle_driver = { .name ="omap3_idle" , .owner =THIS_MODULE ,
@@ -303,6 +321,8 @@ int omap3_idle_init(void)return -EINVAL ; dev->state_count = count; +omap3_cpuidle_update_states (); +if (cpuidle_register_device (dev)) {printk (KERN_ERR "%s: CPUidle register device failed\n" , __func__);
arch/arm/mach-omap2/pm.h +2 -0
@@ -86,6 +86,8 @@ extern void omap34xx_cpu_suspend(u32 *addr, int save_state);extern void save_secure_ram_context (u32 *addr);extern void omap3_save_scratchpad_contents (void ); +extern void omap3_cpuidle_update_states (void ); +extern unsigned int omap24xx_idle_loop_suspend_sz;extern unsigned int omap34xx_suspend_sz;extern unsigned int save_secure_ram_context_sz;
arch/arm/mach-omap2/pm34xx.c +2 -0
@@ -968,6 +968,8 @@ void omap3_pm_off_mode_enable(int enable)else state =PWRDM_POWER_RET ; +omap3_cpuidle_update_states (); +#ifdef CONFIG_OMAP_PM_SRF resource_lock_opp (VDD1_OPP );resource_lock_opp (VDD2_OPP );
Signature · 1 line
1.6.2.2
Quoted 11 lines · Sanjeev Premi
When '
enable_off_mode' is 0, the target power state for MPU and Core is locally changed toPWRDM_POWER_RETbut, the statistics are updated for idle state originally selected by the governor.This patch 'invalidates' the idle states that lead either of MPU or Core to
PWRDM_POWER_OFFstate when 'enable_off_mode' is '0'. The states are valid once 'enable_off_mode' is set to '1'.Signed-off-by Sanjeev Premi <[email protected]>
This is a good start, but doesn't actually fix the problem. This is because the 'valid' field is an OMAP specific field and is not checked in any of our 'enter_idle' hooks.
It works in your test case because the code snippet you mentioned in PATCH 0/0 still modifies the target state.
What we need is for the enter_idle_bm() enter function to check the .valid flag. If it's not valid, then keep dropping states until it finds a valid flag or it hits the safe state.
Kevin
Quoted 98 lines
--- arch/arm/mach-omap2/cpuidle34xx.c | 34 +++++++++++++++++++++++++++------- arch/arm/mach-omap2/pm.h | 2 ++ arch/arm/mach-omap2/pm34xx.c | 2 ++ 3 files changed, 31 insertions(+), 7 deletions(-)arch/arm/mach-omap2/cpuidle34xx.c +27
-7@@ -104,13 +104,6 @@ static int omap3_enter_idle(struct cpuidle_device *dev,local_irq_disable ();local_fiq_disable (); -if (!enable_off_mode) { -if (mpu_state <PWRDM_POWER_RET ) - mpu_state =PWRDM_POWER_RET ; -if (core_state <PWRDM_POWER_RET ) - core_state =PWRDM_POWER_RET ; - } -pwrdm_set_next_pwrst (mpu_pd, mpu_state);pwrdm_set_next_pwrst (core_pd, core_state);@@ -254,6 +247,31 @@ void omap_init_power_states(void)CPUIDLE_FLAG_CHECK_BM ; } +/** +* omap3_cpuidle_update_states - Update the cpuidle states. +* +* Currently, this function toggles the validity of idle states based upon +* the flag 'enable_off_mode'. When the flag is set all states are valid. +* Else, states leading to OFF state set to be invalid. +*/ +void omap3_cpuidle_update_states (void ) +{ +int i; + +for (i =OMAP3_STATE_C1 ; i <OMAP3_MAX_STATES ; i++) { +if (enable_off_mode) { + omap3_power_states[i].valid =1 ; + } +else { +if ((omap3_power_states[i].mpu_state + ==PWRDM_POWER_OFF ) + || (omap3_power_states[i].core_state + ==PWRDM_POWER_RET )) + omap3_power_states[i].valid =0 ; + } + } +} +struct cpuidle_driver omap3_idle_driver = { .name ="omap3_idle" , .owner =THIS_MODULE ,@@ -303,6 +321,8 @@ int omap3_idle_init(void)return -EINVAL ; dev->state_count = count; +omap3_cpuidle_update_states (); +if (cpuidle_register_device (dev)) {printk (KERN_ERR "%s: CPUidle register device failed\n" , __func__);arch/arm/mach-omap2/pm.h +2
-0@@ -86,6 +86,8 @@ extern void omap34xx_cpu_suspend(u32 *addr, int save_state);extern void save_secure_ram_context (u32 *addr);extern void omap3_save_scratchpad_contents (void ); +extern void omap3_cpuidle_update_states (void ); +extern unsigned int omap24xx_idle_loop_suspend_sz;extern unsigned int omap34xx_suspend_sz;extern unsigned int save_secure_ram_context_sz;arch/arm/mach-omap2/pm34xx.c +2
-0@@ -968,6 +968,8 @@ void omap3_pm_off_mode_enable(int enable)else state =PWRDM_POWER_RET ; +omap3_cpuidle_update_states (); +#ifdef CONFIG_OMAP_PM_SRF resource_lock_opp (VDD1_OPP );resource_lock_opp (VDD2_OPP );Signature · 6 lines
1.6.2.2 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 26 lines
-----Original Message-----
From: Kevin Hilman [mailto:[email protected]]
Sent: Thursday, September 10, 2009 11:51 PM
To: Premi, Sanjeev
Cc: [email protected]
Subject: Re: [PATCH 1/1] PM : cpuidle - update statistics for correct stateQuoted 11 lines · Sanjeev Premi
When '
enable_off_mode' is 0, the target power state for MPU and Core is locally changed toPWRDM_POWER_RETbut, the statistics are updated for idle state originally selected by the governor.This patch 'invalidates' the idle states that lead either of MPU or Core to
PWRDM_POWER_OFFstate when 'enable_off_mode' is '0'. The states are valid once 'enable_off_mode' is set to '1'.Signed-off-by Sanjeev Premi <[email protected]>This is a good start, but doesn't actually fix the problem. This is because the 'valid' field is an OMAP specific field and is not checked in any of our '
enter_idle' hooks.
Quoted 6 lines
It works in your test case because the code snippet you mentioned in PATCH 0/0 still modifies the target state.
What we need is for the
enter_idle_bm()enter function to check the .valid flag. If it's not valid, then keep dropping states until it finds a valid flag or it hits the safe state.
We do have a omap3_enter_idle_bm(), but the problem is that calculating the current index in dev->states will be costly operation. We know the pointer to 'target' c-state; but the translating the index back to the omap3_power_states[] seems 'intense' operation in idle_bm check.
I believe the right solution will be to add .valid in the cpuidle framework itself. I am submitting a patch for same.
Best regards,
Sanjeev
Quoted 4 lines
Kevin
[snip]---[snip]---[snip]
Quoted 29 lines · Sanjeev
Quoted 29 lines
-----Original Message-----
From: Kevin Hilman [mailto:[email protected]]
Sent: Thursday, September 10, 2009 11:51 PM
To: Premi, Sanjeev
Cc: [email protected]
Subject: Re: [PATCH 1/1] PM : cpuidle - update statistics for correct stateQuoted 11 lines · Sanjeev Premi
When '
enable_off_mode' is 0, the target power state for MPU and Core is locally changed toPWRDM_POWER_RETbut, the statistics are updated for idle state originally selected by the governor.This patch 'invalidates' the idle states that lead either of MPU or Core to
PWRDM_POWER_OFFstate when 'enable_off_mode' is '0'. The states are valid once 'enable_off_mode' is set to '1'.Signed-off-by Sanjeev Premi <[email protected]>This is a good start, but doesn't actually fix the problem. This is because the 'valid' field is an OMAP specific field and is not checked in any of our '
enter_idle' hooks.It works in your test case because the code snippet you mentioned in PATCH 0/0 still modifies the target state.
Quoted 8 lines
Quoted 3 lines
What we need is for the
enter_idle_bm()enter function to check the .valid flag. If it's not valid, then keep dropping states until it finds a valid flag or it hits the safe state.We do have a
omap3_enter_idle_bm(), but the problem is that calculating the current index indev->stateswill be costly operation. We know the pointer to 'target' c-state; but the translating the index back to the omap3_power_states[] seems 'intense' operation inidle_bmcheck.
Maybe this array should be converted to a list.
Quoted 2 lines
I believe the right solution will be to add .valid in the cpuidle framework itself. I am submitting a patch for same.
I like this idea better.
Kevin