ACPI: PM: s2idle: Refine active GPEs check

commit d5406284ff803a578ca503373624312770319054 upstream.

The check for any active GPEs added by commit fdde0ff8590b ("ACPI:
PM: s2idle: Prevent spurious SCIs from waking up the system") turns
out to be insufficiently precise to prevent some systems from
resuming prematurely due to a spurious EC wakeup, so refine it
by first checking if any GPEs other than the EC GPE are active
and skipping all of the SCIs coming from the EC that do not produce
any genuine wakeup events after processing.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=206629
Fixes: fdde0ff8590b ("ACPI: PM: s2idle: Prevent spurious SCIs from waking up the system")
Reported-by: Ondřej Caletka <ondrej@caletka.cz>
Tested-by: Ondřej Caletka <ondrej@caletka.cz>
Cc: 5.4+ <stable@vger.kernel.org> # 5.4+
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 1767dfedb439178d8a3a1ec63f045aacbfa7861b..9a82841c5b5a494567102429dc63d6178d70346f 100644 (file)
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -2052,6 +2052,11 @@ void acpi_ec_set_gpe_wake_mask(u8 action)
                acpi_set_gpe_wake_mask(NULL, first_ec->gpe, action);
 }
 
+bool acpi_ec_other_gpes_active(void)
+{
+       return acpi_any_gpe_status_set(first_ec ? first_ec->gpe : U32_MAX);
+}
+
 bool acpi_ec_dispatch_gpe(void)
 {
        u32 ret;

diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 3616daec650b1fd2a8b25ceb99bcadcd2d10c6be..d44c591c4ee4d5c3623d84b83c8a84f1460f8505 100644 (file)
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -202,6 +202,7 @@ void acpi_ec_remove_query_handler(struct acpi_ec *ec, u8 query_bit);
 
 #ifdef CONFIG_PM_SLEEP
 void acpi_ec_flush_work(void);
+bool acpi_ec_other_gpes_active(void);
 bool acpi_ec_dispatch_gpe(void);
 #endif
 

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index da9953609323262be4ee5e57a837bccfdcc68cc8..ce1d9048a36d98f903ee498cd8c3728d0fa1966f 100644 (file)
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -1014,18 +1014,19 @@ static bool acpi_s2idle_wake(void)
                        return true;
 
                /*
-                * If there are no EC events to process and at least one of the
-                * other enabled GPEs is active, the wakeup is regarded as a
-                * genuine one.
-                *
-                * Note that the checks below must be carried out in this order
-                * to avoid returning prematurely due to a change of the EC GPE
-                * status bit from unset to set between the checks with the
-                * status bits of all the other GPEs unset.
+                * If the status bit is set for any enabled GPE other than the
+                * EC one, the wakeup is regarded as a genuine one.
                 */
-               if (acpi_any_gpe_status_set(U32_MAX) && !acpi_ec_dispatch_gpe())
+               if (acpi_ec_other_gpes_active())
                        return true;
 
+               /*
+                * If the EC GPE status bit has not been set, the wakeup is
+                * regarded as a spurious one.
+                */
+               if (!acpi_ec_dispatch_gpe())
+                       return false;
+
                /*
                 * Cancel the wakeup and process all pending events in case
                 * there are any wakeup ones in there.