summaryrefslogtreecommitdiffstats
path: root/drivers/pci/pci-driver.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-10-07 00:50:24 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-10-14 02:17:34 +0200
commit58a1fbbb2ee873dd1fe327e80bc7b08e80866269 (patch)
tree3c3552e6631af82c4afb3f449ae8042bc925bf53 /drivers/pci/pci-driver.c
parentef25ba0476015908ef5960f9faac149ddf34ede0 (diff)
downloadlinux-stable-58a1fbbb2ee873dd1fe327e80bc7b08e80866269.tar.gz
linux-stable-58a1fbbb2ee873dd1fe327e80bc7b08e80866269.tar.bz2
linux-stable-58a1fbbb2ee873dd1fe327e80bc7b08e80866269.zip
PM / PCI / ACPI: Kick devices that might have been reset by firmware
There is a concern that if the platform firmware was involved in the system resume that's being completed, some devices might have been reset by it and if those devices had the power.direct_complete flag set during the preceding suspend transition, they may stay in a reset-power-on state indefinitely (until they are runtime-resumed and then suspended again). That may not be a big deal from the individual device's perspective, but if the system is an SoC, it may be prevented from entering deep SoC-wide low-power states on idle because of that. The devices that are most likely to be affected by this issue are PCI devices and ACPI-enumerated devices using the general ACPI PM domain, so to prevent it from happening for those devices, force a runtime resume for them if they have their power.direct_complete flags set and the platform firmware was involved in the resume transition currently in progress. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/pci/pci-driver.c')
-rw-r--r--drivers/pci/pci-driver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index c9ce3073d7fe..306124bba61e 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -687,7 +687,7 @@ static int pci_pm_prepare(struct device *dev)
static void pci_pm_complete(struct device *dev)
{
pci_dev_complete_resume(to_pci_dev(dev));
- pm_generic_complete(dev);
+ pm_complete_with_resume_check(dev);
}
#else /* !CONFIG_PM_SLEEP */