From 38e6984de8c5efcfa334dcb6edd9f9b1c967ea9c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 10 Mar 2022 14:50:32 +0100 Subject: [PATCH] 5.16-stable patches added patches: revert-acpi-pm-s2idle-cancel-wakeup-before-dispatching-ec-gpe.patch --- ...cel-wakeup-before-dispatching-ec-gpe.patch | 73 +++++++++++++++++++ queue-5.16/series | 1 + 2 files changed, 74 insertions(+) create mode 100644 queue-5.16/revert-acpi-pm-s2idle-cancel-wakeup-before-dispatching-ec-gpe.patch diff --git a/queue-5.16/revert-acpi-pm-s2idle-cancel-wakeup-before-dispatching-ec-gpe.patch b/queue-5.16/revert-acpi-pm-s2idle-cancel-wakeup-before-dispatching-ec-gpe.patch new file mode 100644 index 00000000000..4acc62076fd --- /dev/null +++ b/queue-5.16/revert-acpi-pm-s2idle-cancel-wakeup-before-dispatching-ec-gpe.patch @@ -0,0 +1,73 @@ +From 9f2232c5132650e518241c9e66fdc5857d148ec6 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Thu, 10 Mar 2022 14:47:12 +0100 +Subject: Revert "ACPI: PM: s2idle: Cancel wakeup before dispatching EC GPE" + +From: Greg Kroah-Hartman + +This reverts commit 4287509b4d21e34dc49266c6239920811e189e40 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 +Reported-by: Rafael J. Wysocki +Cc: Sasha Levin +Cc: Justin Forbes +Cc: Mark Pearson +Signed-off-by: Greg Kroah-Hartman +--- + drivers/acpi/ec.c | 10 ---------- + drivers/acpi/sleep.c | 14 ++++++++++---- + 2 files changed, 10 insertions(+), 14 deletions(-) + +--- a/drivers/acpi/ec.c ++++ b/drivers/acpi/ec.c +@@ -2052,16 +2052,6 @@ bool acpi_ec_dispatch_gpe(void) + 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. + */ +--- a/drivers/acpi/sleep.c ++++ b/drivers/acpi/sleep.c +@@ -739,15 +739,21 @@ bool acpi_s2idle_wake(void) + 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()) { + 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(); + + /* diff --git a/queue-5.16/series b/queue-5.16/series index 3397f79c31a..86d7d656d3a 100644 --- a/queue-5.16/series +++ b/queue-5.16/series @@ -50,3 +50,4 @@ xen-9p-use-alloc-free_pages_exact.patch xen-pvcalls-use-alloc-free_pages_exact.patch xen-gnttab-fix-gnttab_end_foreign_access-without-page-specified.patch xen-netfront-react-properly-to-failing-gnttab_end_foreign_access_ref.patch +revert-acpi-pm-s2idle-cancel-wakeup-before-dispatching-ec-gpe.patch -- 2.47.2