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

ACPI: EC: PM: Avoid flushing EC work when EC GPE is inactive 



Flushing the EC work while suspended to idle when the EC GPE status
is not set causes some EC wakeup events (notably power button and
lid ones) to be missed after a series of spurious wakeups on the Dell
XPS13 9360 in my office.

If that happens, the machine cannot be woken up from suspend-to-idle
by the power button or lid status change and it needs to be woken up
in some other way (eg. by a key press).

Flushing the EC work only after successful dispatching the EC GPE,
which means that its status has been set, avoids the issue, so change
the code in question accordingly.

Fixes: 7b301750 ("ACPI: EC: PM: Avoid premature returns from acpi_s2idle_wake()")
Cc: 5.4+ <stable@vger.kernel.org> # 5.4+
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tested-by: default avatarChris Chiu <chiu@endlessm.com>
parent 7b301750

drivers/acpi/ec.c

+5 −1
Original line number Diff line number Diff line
@@ -2016,9 +2016,13 @@ bool acpi_ec_dispatch_gpe(void) 
	 * to allow the caller to process events properly after that.

	 */

	ret = acpi_dispatch_gpe(NULL, first_ec->gpe);

	if (ret == ACPI_INTERRUPT_HANDLED)

	if (ret == ACPI_INTERRUPT_HANDLED) {

		pm_pr_dbg("EC GPE dispatched\n");



		/* Flush the event and query workqueues. */

		acpi_ec_flush_work();

	}



	return false;

}

#endif /* CONFIG_PM_SLEEP */

drivers/acpi/sleep.c

+4 −11
Original line number Diff line number Diff line
@@ -980,13 +980,6 @@ static int acpi_s2idle_prepare_late(void) 
	return 0;

}



static void acpi_s2idle_sync(void)

{

	/* The EC driver uses special workqueues that need to be flushed. */

	acpi_ec_flush_work();

	acpi_os_wait_events_complete(); /* synchronize Notify handling */

}



static bool acpi_s2idle_wake(void)

{

	if (!acpi_sci_irq_valid())
@@ -1018,7 +1011,7 @@ static bool acpi_s2idle_wake(void) 
			return true;



		/*

		 * Cancel the wakeup and process all pending events in case

		 * 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
@@ -1026,8 +1019,7 @@ static bool acpi_s2idle_wake(void) 
		 * should be missed by canceling the wakeup here.

		 */

		pm_system_cancel_wakeup();



		acpi_s2idle_sync();

		acpi_os_wait_events_complete();



		/*

		 * The SCI is in the "suspended" state now and it cannot produce
@@ -1060,7 +1052,8 @@ static void acpi_s2idle_restore(void) 
	 * of GPEs.

	 */

	acpi_os_wait_events_complete(); /* synchronize GPE processing */

	acpi_s2idle_sync();

	acpi_ec_flush_work(); /* flush the EC driver's workqueues */

	acpi_os_wait_events_complete(); /* synchronize Notify handling */



	s2idle_wakeup = false;

CRA Git | Maintained and supported by SUSTech CRA and CCSE