5.4-stable patches

added patches:
	revert-acpi-pm-s2idle-cancel-wakeup-before-dispatching-ec-gpe.patch

diff --git a/queue-5.4/revert-acpi-pm-s2idle-cancel-wakeup-before-dispatching-ec-gpe.patch b/queue-5.4/revert-acpi-pm-s2idle-cancel-wakeup-before-dispatching-ec-gpe.patch
new file mode 100644 (file)
index 0000000..421a186
--- /dev/null
+++ b/queue-5.4/revert-acpi-pm-s2idle-cancel-wakeup-before-dispatching-ec-gpe.patch
@@ -0,0 +1,71 @@
+From 9f2232c5132650e518241c9e66fdc5857d148ec6 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Thu, 10 Mar 2022 14:47:12 +0100
+Subject: Revert "ACPI: PM: s2idle: Cancel wakeup before dispatching EC GPE"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+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>
+---
+ 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
+@@ -2003,16 +2003,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
+@@ -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();
+ 
+               /*

diff --git a/queue-5.4/series b/queue-5.4/series
index f11238a48920a47489d859b87837eed9c192d400..9f1676584454763a2cd4da85bf35e8d66fba5a4e 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -30,3 +30,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