Commit fdde0ff8 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

ACPI: PM: s2idle: Prevent spurious SCIs from waking up the system

If the platform triggers a spurious SCI even though the status bit
is not set for any GPE when the system is suspended to idle, it will
be treated as a genuine wakeup, so avoid that by checking if any GPEs
are active at all before returning 'true' from acpi_s2idle_wake().

Link: https://bugzilla.kernel.org/show_bug.cgi?id=206413
Fixes: 56b99184 ("PM: sleep: Simplify suspend-to-idle control flow")
Reported-by: default avatarTsuchiya Yuto <kitakar@gmail.com>
Cc: 5.4+ <stable@vger.kernel.org> # 5.4+
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent ea128834
...@@ -1006,10 +1006,16 @@ static bool acpi_s2idle_wake(void) ...@@ -1006,10 +1006,16 @@ static bool acpi_s2idle_wake(void)
return true; return true;
/* /*
* If there are no EC events to process, the wakeup is regarded * If there are no EC events to process and at least one of the
* as a genuine one. * 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 (!acpi_ec_dispatch_gpe()) if (acpi_any_gpe_status_set() && !acpi_ec_dispatch_gpe())
return true; return true;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment