mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 14:44:12 +00:00
Revert "ACPI: PM: s2idle: Cancel wakeup before dispatching EC GPE"
This reverts commite799974e7c
which is commitdc0075ba7f
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>
This commit is contained in:
parent
dea18aef20
commit
39d332de8e
2 changed files with 10 additions and 14 deletions
|
@ -2051,16 +2051,6 @@ bool acpi_ec_dispatch_gpe(void)
|
||||||
if (acpi_any_gpe_status_set(first_ec->gpe))
|
if (acpi_any_gpe_status_set(first_ec->gpe))
|
||||||
return true;
|
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
|
* Dispatch the EC GPE in-band, but do not report wakeup in any case
|
||||||
* to allow the caller to process events properly after that.
|
* to allow the caller to process events properly after that.
|
||||||
|
|
|
@ -739,15 +739,21 @@ bool acpi_s2idle_wake(void)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/* Check non-EC GPE wakeups and dispatch the EC GPE. */
|
||||||
* Check non-EC GPE wakeups and if there are none, cancel the
|
|
||||||
* SCI-related wakeup and dispatch the EC GPE.
|
|
||||||
*/
|
|
||||||
if (acpi_ec_dispatch_gpe()) {
|
if (acpi_ec_dispatch_gpe()) {
|
||||||
pm_pr_dbg("ACPI non-EC GPE wakeup\n");
|
pm_pr_dbg("ACPI non-EC GPE wakeup\n");
|
||||||
return true;
|
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();
|
acpi_os_wait_events_complete();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue