diff options
| author | Lukas Wunner <lukas@wunner.de> | 2016-03-23 00:11:20 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-12 09:09:03 -0700 |
| commit | b05e5a587ddc11255de76657e6b4b0e960783cc3 (patch) | |
| tree | fb9de040c696155bfb2de432a230758869e13f8f | |
| parent | fe81b4d996fbf36cf4e84869b6c5f4394f5e5af9 (diff) | |
| download | linux-stable-b05e5a587ddc11255de76657e6b4b0e960783cc3.tar.gz linux-stable-b05e5a587ddc11255de76657e6b4b0e960783cc3.tar.bz2 linux-stable-b05e5a587ddc11255de76657e6b4b0e960783cc3.zip | |
ACPI / PM: Runtime resume devices when waking from hibernate
commit fbda4b38fa3995aa0777fe9cbbdcb223c6292083 upstream.
Commit 58a1fbbb2ee8 ("PM / PCI / ACPI: Kick devices that might have been
reset by firmware") added a runtime resume for devices that were runtime
suspended when the system entered suspend-to-RAM.
Briefly, the motivation was to ensure that devices did not remain in a
reset-power-on state after resume, potentially preventing deep SoC-wide
low-power states from being entered on idle.
Currently we're not doing the same when leaving suspend-to-disk and this
asymmetry is a problem if drivers rely on the automatic resume triggered
by pm_complete_with_resume_check(). Fix it.
Fixes: 58a1fbbb2ee8 (PM / PCI / ACPI: Kick devices that might have been reset by firmware)
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/acpi/sleep.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 0d94621dc856..e3322adaaae0 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -714,6 +714,7 @@ static int acpi_hibernation_enter(void) static void acpi_hibernation_leave(void) { + pm_set_resume_via_firmware(); /* * If ACPI is not enabled by the BIOS and the boot kernel, we need to * enable it here. |