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

This reverts commit 9d09cb110868f027d015fbc6c64ba1e45a69a192 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: Hans de Goede <hdegoede@redhat.com>
Reported-by: Rafael 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index ce9a570f217adb3b339f113d3a5004d7c4490a05..e5b92958c299ed3b07e800591e34a1844b95b566 100644 (file)
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -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.

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index cd590b4793e09f80071a6687357eed5be1aeb73b..b0e23e3fe0d56fa5cf4ee62427c81e3d728994a8 100644 (file)
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -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();
 
                /*