summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Wunner <lukas@wunner.de>2016-03-23 00:11:20 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-03-23 02:43:11 +0100
commitfbda4b38fa3995aa0777fe9cbbdcb223c6292083 (patch)
treed4d9f9750a861185e8a249e480332894ffc69000
parent276142730c39c9839465a36a90e5674a8c34e839 (diff)
downloadop-kernel-dev-fbda4b38fa3995aa0777fe9cbbdcb223c6292083.zip
op-kernel-dev-fbda4b38fa3995aa0777fe9cbbdcb223c6292083.tar.gz
ACPI / PM: Runtime resume devices when waking from hibernate
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> Cc: 4.4+ <stable@vger.kernel.org> # 4.4+ Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/acpi/sleep.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 9cb9752..f054cad 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.
OpenPOWER on IntegriCloud