stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Hans de Goede <hdegoede@redhat.com>,
	"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
	Sasha Levin <sashal@kernel.org>,
	Justin Forbes <jmforbes@linuxtx.org>,
	Mark Pearson <markpearson@lenovo.com>
Subject: [PATCH 5.16 53/53] Revert "ACPI: PM: s2idle: Cancel wakeup before dispatching EC GPE"
Date: Thu, 10 Mar 2022 15:09:58 +0100	[thread overview]
Message-ID: <20220310140813.355738148@linuxfoundation.org> (raw)
In-Reply-To: <20220310140811.832630727@linuxfoundation.org>

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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 <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
@@ -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();
 
 		/*



  parent reply	other threads:[~2022-03-10 14:16 UTC|newest]

Thread overview: 65+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-10 14:09 [PATCH 5.16 00/53] 5.16.14-rc2 review Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 01/53] x86/speculation: Rename RETPOLINE_AMD to RETPOLINE_LFENCE Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 02/53] x86/speculation: Add eIBRS + Retpoline options Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 03/53] Documentation/hw-vuln: Update spectre doc Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 04/53] x86/speculation: Include unprivileged eBPF status in Spectre v2 mitigation reporting Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 05/53] x86/speculation: Use generic retpoline by default on AMD Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 06/53] x86/speculation: Update link to AMD speculation whitepaper Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 07/53] x86/speculation: Warn about Spectre v2 LFENCE mitigation Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 08/53] x86/speculation: Warn about eIBRS + LFENCE + Unprivileged eBPF + SMT Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 09/53] ARM: report Spectre v2 status through sysfs Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 10/53] ARM: early traps initialisation Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 11/53] ARM: use LOADADDR() to get load address of sections Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 12/53] ARM: Spectre-BHB workaround Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 13/53] ARM: include unprivileged BPF status in Spectre V2 reporting Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 14/53] arm64: add ID_AA64ISAR2_EL1 sys register Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 15/53] arm64: cpufeature: add HWCAP for FEAT_AFP Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 16/53] arm64: cpufeature: add HWCAP for FEAT_RPRES Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 17/53] arm64: entry.S: Add ventry overflow sanity checks Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 18/53] arm64: spectre: Rename spectre_v4_patch_fw_mitigation_conduit Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 19/53] KVM: arm64: Allow indirect vectors to be used without SPECTRE_V3A Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 20/53] arm64: entry: Make the trampoline cleanup optional Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 21/53] arm64: entry: Free up another register on kptis tramp_exit path Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 22/53] arm64: entry: Move the trampoline data page before the text page Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 23/53] arm64: entry: Allow tramp_alias to access symbols after the 4K boundary Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 24/53] arm64: entry: Dont assume tramp_vectors is the start of the vectors Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 25/53] arm64: entry: Move trampoline macros out of ifdefd section Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 26/53] arm64: entry: Make the kpti trampolines kpti sequence optional Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 27/53] arm64: entry: Allow the trampoline text to occupy multiple pages Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 28/53] arm64: entry: Add non-kpti __bp_harden_el1_vectors for mitigations Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 29/53] arm64: entry: Add vectors that have the bhb mitigation sequences Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 30/53] arm64: entry: Add macro for reading symbol addresses from the trampoline Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 31/53] arm64: Add percpu vectors for EL1 Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 32/53] arm64: proton-pack: Report Spectre-BHB vulnerabilities as part of Spectre-v2 Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 33/53] arm64: Mitigate spectre style branch history side channels Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 34/53] KVM: arm64: Allow SMCCC_ARCH_WORKAROUND_3 to be discovered and migrated Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 35/53] arm64: Use the clearbhb instruction in mitigations Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 36/53] arm64: proton-pack: Include unprivileged eBPF status in Spectre v2 mitigation reporting Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 37/53] ARM: fix build error when BPF_SYSCALL is disabled Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 38/53] ARM: fix co-processor register typo Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 39/53] ARM: Do not use NOCROSSREFS directive with ld.lld Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 40/53] arm64: Do not include __READ_ONCE() block in assembly files Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 41/53] ARM: fix build warning in proc-v7-bugs.c Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 42/53] xen/xenbus: dont let xenbus_grant_ring() remove grants in error case Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 43/53] xen/grant-table: add gnttab_try_end_foreign_access() Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 44/53] xen/blkfront: dont use gnttab_query_foreign_access() for mapped status Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 45/53] xen/netfront: " Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 46/53] xen/scsifront: " Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 47/53] xen/gntalloc: dont use gnttab_query_foreign_access() Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 48/53] xen: remove gnttab_query_foreign_access() Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 49/53] xen/9p: use alloc/free_pages_exact() Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 50/53] xen/pvcalls: " Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 51/53] xen/gnttab: fix gnttab_end_foreign_access() without page specified Greg Kroah-Hartman
2022-03-10 14:09 ` [PATCH 5.16 52/53] xen/netfront: react properly to failing gnttab_end_foreign_access_ref() Greg Kroah-Hartman
2022-03-10 14:09 ` Greg Kroah-Hartman [this message]
2022-03-10 18:48 ` [PATCH 5.16 00/53] 5.16.14-rc2 review Jon Hunter
2022-03-10 19:32 ` Shuah Khan
2022-03-10 21:30 ` Justin Forbes
2022-03-10 21:53 ` Naresh Kamboju
2022-03-10 23:20 ` Ron Economos
2022-03-10 23:20 ` Florian Fainelli
2022-03-11  0:14 ` Fox Chen
2022-03-11  1:03 ` Guenter Roeck
2022-03-11  3:11 ` Zan Aziz
2022-03-11  8:14 ` Rudi Heitbaum
2022-03-11 10:55 ` Bagas Sanjaya

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220310140813.355738148@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=hdegoede@redhat.com \
    --cc=jmforbes@linuxtx.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=markpearson@lenovo.com \
    --cc=rafael.j.wysocki@intel.com \
    --cc=sashal@kernel.org \
    --cc=stable@vger.kernel.org \
    --subject='Re: [PATCH 5.16 53/53] Revert "ACPI: PM: s2idle: Cancel wakeup before dispatching EC GPE"' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).