From e196441bdf2dbf0526b28a6829c39557c236d611 Mon Sep 17 00:00:00 2001 From: Len Brown Date: Thu, 4 Oct 2007 01:23:47 -0400 Subject: 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 --- drivers/acpi/processor_idle.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'drivers/acpi') diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 99da6a790857..0cad56ca342b 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; /* -- cgit v1.2.3-59-g8ed1b