Skip to contentSkip to conversation

ACPI: EC: PM: Two fixes related to suspend-to-idle

PATCH New Rafael J. Wysocki 1 participant 3 messages Oct 5, 2020 ACPI

lore
Share & tools
lore
#0 lore raw

cover ACPI: EC: PM: Two fixes related to suspend-to-idle

Hi All,

The following two patches address two suspend-to-idle-related issues in the ACPI EC driver.

Please refer to the patch changelogs for details.

Thanks!

#1 lore raw

PATCH 1/2 ACPI: EC: PM: Flush EC work unconditionally after wakeup

From: Rafael J. Wysocki <[email protected]>
Subject: [PATCH] ACPI: EC: PM: Flush EC work unconditionally after wakeup

Commit 607b9df63057 ("ACPI: EC: PM: Avoid flushing EC work when EC GPE is inactive") has been reported to cause some power button wakeup events to be missed on some systems, so modify acpi_ec_dispatch_gpe() to call acpi_ec_flush_work() unconditionally to effectively reverse the changes made by that commit.

Also note that the problem which prompted commit 607b9df63057 is not reproducible any more on the affected machine.

Fixes 607b9df63057 ("ACPI: EC: PM: Avoid flushing EC work when EC GPE is inactive")
Cc 5.4+ <[email protected]> # 5.4+
---
 drivers/acpi/ec.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/acpi/ec.c +3 -4
Index: linux-pm/drivers/acpi/ec.c
===================================================================
@@ -2019,12 +2019,11 @@ bool acpi_ec_dispatch_gpe(void)
 	 * to allow the caller to process events properly after that.
 	 */
 	ret = acpi_dispatch_gpe(NULL, first_ec->gpe);
-	if (ret == ACPI_INTERRUPT_HANDLED) {
+	if (ret == ACPI_INTERRUPT_HANDLED)
 		pm_pr_dbg("ACPI EC GPE dispatched\n");
 
-		/* Flush the event and query workqueues. */
-		acpi_ec_flush_work();
-	}
+	/* Flush the event and query workqueues. */
+	acpi_ec_flush_work();
 
 	return false;
 }
#2 lore raw

PATCH 2/2 ACPI: EC: PM: Drop ec_no_wakeup check from acpi_ec_dispatch_gpe()

In reply to Rafael J. Wysocki

From: Rafael J. Wysocki <[email protected]>

It turns out that in some cases there are EC events to flush in acpi_ec_dispatch_gpe() even though the ec_no_wakeup kernel parameter is set and the EC GPE is disabled while sleeping, so drop the ec_no_wakeup check that prevents those events from being processed from acpi_ec_dispatch_gpe().

---
 drivers/acpi/ec.c |    3 ---
 1 file changed, 3 deletions(-)
drivers/acpi/ec.c +0 -3
Index: linux-pm/drivers/acpi/ec.c
===================================================================
@@ -2011,9 +2011,6 @@ bool acpi_ec_dispatch_gpe(void)
 	if (acpi_any_gpe_status_set(first_ec->gpe))
 		return true;
 
-	if (ec_no_wakeup)
-		return false;
-
 	/*
 	 * Dispatch the EC GPE in-band, but do not report wakeup in any case
 	 * to allow the caller to process events properly after that.