Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7fc9c34 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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

This reverts commit 9d09cb11 which is
commit dc0075ba7f387fe4c48a8c674b11ab6f374a6acc upstream.

It's been reported to cause problems with a number of Fedora and Arch
Linux users, so drop it for now until that is resolved.

Link: https://lore.kernel.org/r/CAJZ5v0gE52NT=4kN4MkhV3Gx=M5CeMGVHOF0jgTXDb5WwAMs_Q@mail.gmail.com
Link: https://lore.kernel.org/r/31b9d1cd-6a67-218b-4ada-12f72e6f00dc@redhat.com


Reported-by: default avatarHans de Goede <hdegoede@redhat.com>
Reported-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Sasha Levin <sashal@kernel.org>
Cc: Justin Forbes <jmforbes@linuxtx.org>
Cc: Mark Pearson <markpearson@lenovo.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0e35f3ab

drivers/acpi/ec.c

+0 −10
Original line number Diff line number Diff line
@@ -2002,16 +2002,6 @@ 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

+10 −4
Original line number Diff line number Diff line
@@ -1003,13 +1003,19 @@ static bool acpi_s2idle_wake(void) 
		if (acpi_check_wakeup_handlers())

			return true;



		/*

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

		 * SCI-related wakeup and dispatch the EC GPE.

		 */

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

		if (acpi_ec_dispatch_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 below, so no events

		 * should be missed by canceling the wakeup here.

		 */

		pm_system_cancel_wakeup();

		acpi_os_wait_events_complete();



		/*