Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-15 02:05:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

OMAP3: PM: make omap3_cpuidle_update_states independent of enable_off_mode

Browse Source 
Currently omap3_cpuidle_update_states makes whole sale decision
on which C states to update based on enable_off_mode variable
Instead, achieve the same functionality by independently providing
mpu and core deepest states the system is allowed to achieve and
update the idle states accordingly.

Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Jean Pihet <j-pihet@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
[khilman: fixed additional user of this API in OMAP CPUidle driver]
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
This commit is contained in:
Nishanth Menon 2010-12-20 14:05:08 -06:00 committed by Kevin Hilman
parent c4236d2e79
commit 80723c3fe4
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
arch/arm/mach-omap2/cpuidle34xx.c
View File

@ -293,25 +293,26 @@ select_state:
DEFINE_PER_CPU(struct cpuidle_device, omap3_idle_dev); DEFINE_PER_CPU(struct cpuidle_device, omap3_idle_dev);
/** /**
* omap3_cpuidle_update_states - Update the cpuidle states. * omap3_cpuidle_update_states() - Update the cpuidle states
* @mpu_deepest_state: Enable states upto and including this for mpu domain
* @core_deepest_state: Enable states upto and including this for core domain
* *
* Currently, this function toggles the validity of idle states based upon * This goes through the list of states available and enables and disables the
* the flag 'enable_off_mode'. When the flag is set all states are valid. * validity of C states based on deepest state that can be achieved for the
* Else, states leading to OFF state set to be invalid. * variable domain
*/ */
void omap3_cpuidle_update_states(void) void omap3_cpuidle_update_states(u32 mpu_deepest_state, u32 core_deepest_state)
{ {
int i; int i;
for (i = OMAP3_STATE_C1; i < OMAP3_MAX_STATES; i++) { for (i = OMAP3_STATE_C1; i < OMAP3_MAX_STATES; i++) {
struct omap3_processor_cx *cx = &omap3_power_states[i]; struct omap3_processor_cx *cx = &omap3_power_states[i];
if (enable_off_mode) { if ((cx->mpu_state >= mpu_deepest_state) &&
(cx->core_state >= core_deepest_state)) {
cx->valid = 1; cx->valid = 1;
} else { } else {
if ((cx->mpu_state == PWRDM_POWER_OFF) || cx->valid = 0;
(cx->core_state == PWRDM_POWER_OFF))
cx->valid = 0;
} }
} }
} }
@ -504,7 +505,10 @@ int __init omap3_idle_init(void)
return -EINVAL; return -EINVAL;
dev->state_count = count; dev->state_count = count;
omap3_cpuidle_update_states(); if (enable_off_mode)
omap3_cpuidle_update_states(PWRDM_POWER_OFF, PWRDM_POWER_OFF);
else
omap3_cpuidle_update_states(PWRDM_POWER_RET, PWRDM_POWER_RET);
if (cpuidle_register_device(dev)) { if (cpuidle_register_device(dev)) {
printk(KERN_ERR "%s: CPUidle register device failed\n", printk(KERN_ERR "%s: CPUidle register device failed\n",

2
arch/arm/mach-omap2/pm.h
View File

@ -58,7 +58,7 @@ extern u32 sleep_while_idle;
#endif #endif
#if defined(CONFIG_CPU_IDLE) #if defined(CONFIG_CPU_IDLE)
extern void omap3_cpuidle_update_states(void); extern void omap3_cpuidle_update_states(u32, u32);
#endif #endif
#if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS) #if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS)

2
arch/arm/mach-omap2/pm34xx.c
View File

@ -917,7 +917,7 @@ void omap3_pm_off_mode_enable(int enable)
state = PWRDM_POWER_RET; state = PWRDM_POWER_RET;
#ifdef CONFIG_CPU_IDLE #ifdef CONFIG_CPU_IDLE
omap3_cpuidle_update_states(); omap3_cpuidle_update_states(state, state);
#endif #endif
list_for_each_entry(pwrst, &pwrst_list, node) { list_for_each_entry(pwrst, &pwrst_list, node) {