From: Greg Kroah-Hartman Date: Mon, 14 Feb 2022 07:50:46 +0000 (+0100) Subject: 5.4-stable patches X-Git-Tag: v4.9.302~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f987665e1097b408bba43b92409d0493ea70966;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: acpi-pm-s2idle-cancel-wakeup-before-dispatching-ec-gpe.patch --- diff --git a/queue-5.4/acpi-pm-s2idle-cancel-wakeup-before-dispatching-ec-gpe.patch b/queue-5.4/acpi-pm-s2idle-cancel-wakeup-before-dispatching-ec-gpe.patch new file mode 100644 index 00000000000..27676d74a07 --- /dev/null +++ b/queue-5.4/acpi-pm-s2idle-cancel-wakeup-before-dispatching-ec-gpe.patch @@ -0,0 +1,72 @@ +From dc0075ba7f387fe4c48a8c674b11ab6f374a6acc Mon Sep 17 00:00:00 2001 +From: "Rafael J. Wysocki" +Date: Fri, 4 Feb 2022 18:31:02 +0100 +Subject: ACPI: PM: s2idle: Cancel wakeup before dispatching EC GPE + +From: Rafael J. Wysocki + +commit dc0075ba7f387fe4c48a8c674b11ab6f374a6acc upstream. + +Commit 4a9af6cac050 ("ACPI: EC: Rework flushing of EC work while +suspended to idle") made acpi_ec_dispatch_gpe() check +pm_wakeup_pending(), but that is before canceling the SCI wakeup, +so pm_wakeup_pending() is always true. This causes the loop in +acpi_ec_dispatch_gpe() to always terminate after one iteration which +may not be correct. + +Address this issue by canceling the SCI wakeup earlier, from +acpi_ec_dispatch_gpe() itself. + +Fixes: 4a9af6cac050 ("ACPI: EC: Rework flushing of EC work while suspended to idle") +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Greg Kroah-Hartman +--- + drivers/acpi/ec.c | 10 ++++++++++ + drivers/acpi/sleep.c | 14 ++++---------- + 2 files changed, 14 insertions(+), 10 deletions(-) + +--- a/drivers/acpi/ec.c ++++ b/drivers/acpi/ec.c +@@ -2003,6 +2003,16 @@ 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,19 +1003,13 @@ static bool acpi_s2idle_wake(void) + if (acpi_check_wakeup_handlers()) + return true; + +- /* Check non-EC GPE wakeups and dispatch the EC GPE. */ ++ /* ++ * Check non-EC GPE wakeups and if there are none, cancel the ++ * SCI-related wakeup 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 1e90ec5bc7a..0ef2109eef9 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -68,3 +68,4 @@ seccomp-invalidate-seccomp-mode-to-catch-death-failures.patch hwmon-dell-smm-speed-up-setting-of-fan-speed.patch scsi-lpfc-remove-nvme-support-if-kernel-has-nvme_fc-disabled.patch perf-fix-list-corruption-in-perf_cgroup_switch.patch +acpi-pm-s2idle-cancel-wakeup-before-dispatching-ec-gpe.patch