Commit dc0075ba authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ACPI: PM: s2idle: Cancel wakeup before dispatching EC GPE 



Commit 4a9af6ca ("ACPI: EC: Rework flushing of EC work while
suspended to idle") made acpi_ec_dispatch_gpe() check
pm_wakeup_pending(), but that is before canceling the SCI wakeup,
so pm_wakeup_pending() is always true.  This causes the loop in
acpi_ec_dispatch_gpe() to always terminate after one iteration which
may not be correct.

Address this issue by canceling the SCI wakeup earlier, from
acpi_ec_dispatch_gpe() itself.

Fixes: 4a9af6ca ("ACPI: EC: Rework flushing of EC work while suspended to idle")
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent d6ebb17c

drivers/acpi/ec.c

+10 −0
Original line number Diff line number Diff line
@@ -2065,6 +2065,16 @@ bool acpi_ec_dispatch_gpe(void) 
	if (acpi_any_gpe_status_set(first_ec->gpe))

		return true;



	/*

	 * Cancel the SCI wakeup and process all pending events in case there

	 * are any wakeup ones in there.

	 *

	 * Note that if any non-EC GPEs are active at this point, the SCI will

	 * retrigger after the rearming in acpi_s2idle_wake(), so no events

	 * should be missed by canceling the wakeup here.

	 */

	pm_system_cancel_wakeup();



	/*

	 * Dispatch the EC GPE in-band, but do not report wakeup in any case

	 * to allow the caller to process events properly after that.

drivers/acpi/sleep.c

+4 −10
Original line number Diff line number Diff line
@@ -736,21 +736,15 @@ bool acpi_s2idle_wake(void) 
			return true;

		}



		/* Check non-EC GPE wakeups and dispatch the EC GPE. */

		/*

		 * Check non-EC GPE wakeups and if there are none, cancel the

		 * SCI-related wakeup and dispatch the EC GPE.

		 */

		if (acpi_ec_dispatch_gpe()) {

			pm_pr_dbg("ACPI non-EC GPE wakeup\n");

			return true;

		}



		/*

		 * Cancel the SCI wakeup and process all pending events in case

		 * there are any wakeup ones in there.

		 *

		 * Note that if any non-EC GPEs are active at this point, the

		 * SCI will retrigger after the rearming below, so no events

		 * should be missed by canceling the wakeup here.

		 */

		pm_system_cancel_wakeup();

		acpi_os_wait_events_complete();



		/*