[SRU,OEM-OSP1-B/E,3/6] ACPI: EC: Return bool from acpi_ec_dispatch_gpe()
diff mbox series

Message ID 20200113094034.510111-4-vicamo.yang@canonical.com
State New
Headers show
  • [SRU,OEM-OSP1-B/E,1/6] PCI: irq: Introduce rearm_wake_irq()
Related show

Commit Message

You-Sheng Yang Jan. 13, 2020, 9:40 a.m. UTC
From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>

BugLink: https://bugs.launchpad.net/bugs/1859407

On some systems, if suspend-to-idle is used, the EC may signal system
wakeup events (power button events, for example) as well as events
that should not cause the system to resume and acpi_ec_dispatch_gpe()
needs to be called to determine whether or not the system should
resume then.  In particular, if acpi_ec_dispatch_gpe() doesn't detect
any EC events at all, the system should remain suspended, so it is
useful to know when that is the case.

For this reason, make acpi_ec_dispatch_gpe() return a bool value
indicating whether or not any EC events have been detected by it.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
(cherry picked from commit 9089f16e053afc5e18feaeb9f64cc7c90d6bd687)
Signed-off-by: You-Sheng Yang <vicamo.yang@canonical.com>
 drivers/acpi/ec.c       | 11 ++++++++---
 drivers/acpi/internal.h |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff mbox series

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 49e16f0090957..17c416aa46a68 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -1071,10 +1071,15 @@  void acpi_ec_set_gpe_wake_mask(u8 action)
 		acpi_set_gpe_wake_mask(NULL, first_ec->gpe, action);
-void acpi_ec_dispatch_gpe(void)
+bool acpi_ec_dispatch_gpe(void)
-	if (first_ec)
-		acpi_dispatch_gpe(NULL, first_ec->gpe);
+	u32 ret;
+	if (!first_ec)
+		return false;
+	ret = acpi_dispatch_gpe(NULL, first_ec->gpe);
 /* --------------------------------------------------------------------------
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 6a9e1fb8913ae..587238211be16 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -198,7 +198,7 @@  void acpi_ec_block_transactions(void);
 void acpi_ec_unblock_transactions(void);
 void acpi_ec_mark_gpe_for_wake(void);
 void acpi_ec_set_gpe_wake_mask(u8 action);
-void acpi_ec_dispatch_gpe(void);
+bool acpi_ec_dispatch_gpe(void);
 int acpi_ec_add_query_handler(struct acpi_ec *ec, u8 query_bit,
 			      acpi_handle handle, acpi_ec_query_func func,
 			      void *data);