summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-10-04 01:23:47 -0400
committerLen Brown <len.brown@intel.com>2007-10-10 00:26:43 -0400
commite196441bdf2dbf0526b28a6829c39557c236d611 (patch)
treed0f1c806a503f127ba54ddad7a5a1a0778080bb7
parent4f86d3a8e297205780cca027e974fd5f81064780 (diff)
downloadop-kernel-dev-e196441bdf2dbf0526b28a6829c39557c236d611.zip
op-kernel-dev-e196441bdf2dbf0526b28a6829c39557c236d611.tar.gz
ACPI: cpuidle: port idle timer suspend/resume workaround to cpuidle
Some timers stop during C2 and C3, and so there are various generations of timer broadcast workarounds to deal with that. But that (already complex) code gets confused during suspend. As it is unlikely that deep C-states would save much power during the actual suspend/resume process anyway, deep C-states were disabled via the addition of .suspend/.resume hooks in to the ACPI processor driver. Here that workaround is ported to the cpuidle version of the ACPI idle loop. Technically, ACPI could un-register itself from cpuidle on .suspend, but that code path is currently quite cumbersome. So instead, we simply invoke C1 from the C2 and C3 handlers for the duration of .suspend/.resume. Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--drivers/acpi/processor_idle.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 99da6a7..0cad56c 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -1416,6 +1416,9 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
if (unlikely(!pr))
return 0;
+ if (acpi_idle_suspend)
+ return(acpi_idle_enter_c1(dev, state));
+
if (pr->flags.bm_check)
acpi_idle_update_bm_rld(pr, cx);
@@ -1477,6 +1480,9 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
if (unlikely(!pr))
return 0;
+ if (acpi_idle_suspend)
+ return(acpi_idle_enter_c1(dev, state));
+
local_irq_disable();
current_thread_info()->status &= ~TS_POLLING;
/*
OpenPOWER on IntegriCloud