mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-07 03:18:31 +00:00
Code Issues Releases Wiki Activity

PM: ACPI/PCI: Resume all devices during hibernation

Browse source 
Both the PCI bus type and the ACPI PM domain avoid resuming
runtime-suspended devices with DPM_FLAG_SMART_SUSPEND set during
hibernation (before creating the snapshot image of system memory),
but that turns out to be a mistake.  It leads to functional issues
and adds complexity that's hard to justify.

For this reason, resume all runtime-suspended PCI devices and all
devices in the ACPI PM domains before creating a snapshot image of
system memory during hibernation.

Fixes: 05087360fd (ACPI / PM: Take SMART_SUSPEND driver flag into account)
Fixes: c4b65157ae (PCI / PM: Take SMART_SUSPEND driver flag into account)
Link: https://lore.kernel.org/linux-acpi/917d4399-2e22-67b1-9d54-808561f9083f@uwyo.edu/T/#maf065fe6e4974f2a9d79f332ab99dfaba635f64c
Reported-by: Robert R. Howell <RHowell@uwyo.edu>
Tested-by: Robert R. Howell <RHowell@uwyo.edu>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Rafael J. Wysocki 2019-07-01 12:44:25 +02:00
parent 2f02a7ecd5
commit 501debd4aa
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/acpi/device_pm.c
View file

@ -1112,13 +1112,14 @@ EXPORT_SYMBOL_GPL(acpi_subsys_resume_early);
int acpi_subsys_freeze(struct device *dev) int acpi_subsys_freeze(struct device *dev)
{ {
/* /*
* This used to be done in acpi_subsys_prepare() for all devices and * Resume all runtime-suspended devices before creating a snapshot
* some drivers may depend on it, so do it here. Ideally, however, * image of system memory, because the restore kernel generally cannot
* runtime-suspended devices should not be touched during freeze/thaw * be expected to always handle them consistently and they need to be
* transitions. * put into the runtime-active metastate during system resume anyway,
* so it is better to ensure that the state saved in the image will be
* always consistent with that.
*/ */
if (!dev_pm_test_driver_flags(dev, DPM_FLAG_SMART_SUSPEND)) pm_runtime_resume(dev);
pm_runtime_resume(dev);
return pm_generic_freeze(dev); return pm_generic_freeze(dev);
} }

16
drivers/pci/pci-driver.c
View file

@ -972,15 +972,15 @@ static int pci_pm_freeze(struct device *dev)
} }
/* /*
* This used to be done in pci_pm_prepare() for all devices and some * Resume all runtime-suspended devices before creating a snapshot
* drivers may depend on it, so do it here. Ideally, runtime-suspended * image of system memory, because the restore kernel generally cannot
* devices should not be touched during freeze/thaw transitions, * be expected to always handle them consistently and they need to be
* however. * put into the runtime-active metastate during system resume anyway,
* so it is better to ensure that the state saved in the image will be
* always consistent with that.
*/ */
if (!dev_pm_smart_suspend_and_suspended(dev)) { pm_runtime_resume(dev);
pm_runtime_resume(dev); pci_dev->state_saved = false;
pci_dev->state_saved = false;
}
if (pm->freeze) { if (pm->freeze) {
int error; int error;