aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/cpuidle/cpuidle.c
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2012-05-07 20:57:41 -0400
committerLen Brown <len.brown@intel.com>2012-06-02 00:49:09 -0400
commit4126c0197bc8c58a0bb7fcda07b01b596b6fb4c5 (patch)
treec60aacfbc69627b96dc39dc8dc71ea8f0893c5e5 /drivers/cpuidle/cpuidle.c
parent3af272ab75c7a0c7fa5ae5507724d961f7e7718b (diff)
cpuidle: add support for states that affect multiple cpus
On some ARM SMP SoCs (OMAP4460, Tegra 2, and probably more), the cpus cannot be independently powered down, either due to sequencing restrictions (on Tegra 2, cpu 0 must be the last to power down), or due to HW bugs (on OMAP4460, a cpu powering up will corrupt the gic state unless the other cpu runs a work around). Each cpu has a power state that it can enter without coordinating with the other cpu (usually Wait For Interrupt, or WFI), and one or more "coupled" power states that affect blocks shared between the cpus (L2 cache, interrupt controller, and sometimes the whole SoC). Entering a coupled power state must be tightly controlled on both cpus. The easiest solution to implementing coupled cpu power states is to hotplug all but one cpu whenever possible, usually using a cpufreq governor that looks at cpu load to determine when to enable the secondary cpus. This causes problems, as hotplug is an expensive operation, so the number of hotplug transitions must be minimized, leading to very slow response to loads, often on the order of seconds. This file implements an alternative solution, where each cpu will wait in the WFI state until all cpus are ready to enter a coupled state, at which point the coupled state function will be called on all cpus at approximately the same time. Once all cpus are ready to enter idle, they are woken by an smp cross call. At this point, there is a chance that one of the cpus will find work to do, and choose not to enter idle. A final pass is needed to guarantee that all cpus will call the power state enter function at the same time. During this pass, each cpu will increment the ready counter, and continue once the ready counter matches the number of online coupled cpus. If any cpu exits idle, the other cpus will decrement their counter and retry. To use coupled cpuidle states, a cpuidle driver must: Set struct cpuidle_device.coupled_cpus to the mask of all coupled cpus, usually the same as cpu_possible_mask if all cpus are part of the same cluster. The coupled_cpus mask must be set in the struct cpuidle_device for each cpu. Set struct cpuidle_device.safe_state to a state that is not a coupled state. This is usually WFI. Set CPUIDLE_FLAG_COUPLED in struct cpuidle_state.flags for each state that affects multiple cpus. Provide a struct cpuidle_state.enter function for each state that affects multiple cpus. This function is guaranteed to be called on all cpus at approximately the same time. The driver should ensure that the cpus all abort together if any cpu tries to abort once the function is called. update1: cpuidle: coupled: fix count of online cpus online_count was never incremented on boot, and was also counting cpus that were not part of the coupled set. Fix both issues by introducting a new function that counts online coupled cpus, and call it from register as well as the hotplug notifier. update2: cpuidle: coupled: fix decrementing ready count cpuidle_coupled_set_not_ready sometimes refuses to decrement the ready count in order to prevent a race condition. This makes it unsuitable for use when finished with idle. Add a new function cpuidle_coupled_set_done that decrements both the ready count and waiting count, and call it after idle is complete. Cc: Amit Kucheria <amit.kucheria@linaro.org> Cc: Arjan van de Ven <arjan@linux.intel.com> Cc: Trinabh Gupta <g.trinabh@gmail.com> Cc: Deepthi Dharwar <deepthi@linux.vnet.ibm.com> Reviewed-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Reviewed-by: Kevin Hilman <khilman@ti.com> Tested-by: Kevin Hilman <khilman@ti.com> Signed-off-by: Colin Cross <ccross@android.com> Acked-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/cpuidle/cpuidle.c')
-rw-r--r--drivers/cpuidle/cpuidle.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index 4540672a2e1c..e81cfda295a5 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -171,7 +171,11 @@ int cpuidle_idle_call(void)
171 trace_power_start_rcuidle(POWER_CSTATE, next_state, dev->cpu); 171 trace_power_start_rcuidle(POWER_CSTATE, next_state, dev->cpu);
172 trace_cpu_idle_rcuidle(next_state, dev->cpu); 172 trace_cpu_idle_rcuidle(next_state, dev->cpu);
173 173
174 entered_state = cpuidle_enter_state(dev, drv, next_state); 174 if (cpuidle_state_is_coupled(dev, drv, next_state))
175 entered_state = cpuidle_enter_state_coupled(dev, drv,
176 next_state);
177 else
178 entered_state = cpuidle_enter_state(dev, drv, next_state);
175 179
176 trace_power_end_rcuidle(dev->cpu); 180 trace_power_end_rcuidle(dev->cpu);
177 trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu); 181 trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu);
@@ -407,9 +411,16 @@ static int __cpuidle_register_device(struct cpuidle_device *dev)
407 if (ret) 411 if (ret)
408 goto err_sysfs; 412 goto err_sysfs;
409 413
414 ret = cpuidle_coupled_register_device(dev);
415 if (ret)
416 goto err_coupled;
417
410 dev->registered = 1; 418 dev->registered = 1;
411 return 0; 419 return 0;
412 420
421err_coupled:
422 cpuidle_remove_sysfs(cpu_dev);
423 wait_for_completion(&dev->kobj_unregister);
413err_sysfs: 424err_sysfs:
414 list_del(&dev->device_list); 425 list_del(&dev->device_list);
415 per_cpu(cpuidle_devices, dev->cpu) = NULL; 426 per_cpu(cpuidle_devices, dev->cpu) = NULL;
@@ -464,6 +475,8 @@ void cpuidle_unregister_device(struct cpuidle_device *dev)
464 wait_for_completion(&dev->kobj_unregister); 475 wait_for_completion(&dev->kobj_unregister);
465 per_cpu(cpuidle_devices, dev->cpu) = NULL; 476 per_cpu(cpuidle_devices, dev->cpu) = NULL;
466 477
478 cpuidle_coupled_unregister_device(dev);
479
467 cpuidle_resume_and_unlock(); 480 cpuidle_resume_and_unlock();
468 481
469 module_put(cpuidle_driver->owner); 482 module_put(cpuidle_driver->owner);