[5/8] ACPI: PM: Set s2idle_wakeup earlier and clear it later
diff mbox series

Message ID 5118596.pkUOanpXUM@kreacher
State New, archived
Headers show
  • PM / ACPI: sleep: Simplify the suspend-to-idle control flow
Related show

Commit Message

Rafael J. Wysocki July 16, 2019, 4:15 p.m. UTC
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

The role of the s2idle_wakeup variable is to cause
acpi_pm_wakeup_event() and acpi_pm_notify_handler() to
increment pm_abort_suspend and trigger a wakeup from
suspend-to-idle in case the ACPI SCI wakeup was canceled
by acpi_s2idle_wake().

However, for this purpose it need not be set in acpi_s2idle_wake()
and cleared in acpi_s2idle_sync(), respectively.  In fact, it
may be set as early as in acpi_s2idle_prepare() and cleared as
late as in acpi_s2idle_restore(), so do that to allow subsequent
changes to be simpler.

This change is not expected to alter functionality.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 drivers/acpi/sleep.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff mbox series

Index: linux-pm/drivers/acpi/sleep.c
--- linux-pm.orig/drivers/acpi/sleep.c
+++ linux-pm/drivers/acpi/sleep.c
@@ -972,6 +972,8 @@  static int acpi_s2idle_prepare(void)
 	/* Change the configuration of GPEs to avoid spurious wakeup. */
+	s2idle_wakeup = true;
 	return 0;
@@ -991,7 +993,6 @@  static void acpi_s2idle_wake(void)
 	if (acpi_sci_irq_valid() &&
 	    !irqd_is_wakeup_armed(irq_get_irq_data(acpi_sci_irq))) {
-		s2idle_wakeup = true;
 		 * On some platforms with the LPS0 _DSM device noirq resume
 		 * takes too much time for EC wakeup events to survive, so look
@@ -1012,11 +1013,12 @@  static void acpi_s2idle_sync(void)
 	acpi_os_wait_events_complete();	/* synchronize SCI IRQ handling */
 	acpi_os_wait_events_complete();	/* synchronize Notify handling */
-	s2idle_wakeup = false;
 static void acpi_s2idle_restore(void)
+	s2idle_wakeup = false;