diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-12-20 15:12:40 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-12-20 15:12:40 +0100 |
| commit | 63d15e8c2ac134b3fd5460d19043ffde6f6eeb61 (patch) | |
| tree | 7425de21c71f279a92f1c636892baa2fdfe276e7 | |
| parent | cpufreq: governor: Ensure sufficiently large sampling intervals (diff) | |
| parent | PCI / PM: Force devices to D0 in pci_pm_thaw_noirq() (diff) | |
| download | linux-dev-63d15e8c2ac134b3fd5460d19043ffde6f6eeb61.tar.xz linux-dev-63d15e8c2ac134b3fd5460d19043ffde6f6eeb61.zip | |
Merge branch 'pm-pci'
* pm-pci:
PCI / PM: Force devices to D0 in pci_pm_thaw_noirq()
| -rw-r--r-- | drivers/pci/pci-driver.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 945099d49f8f..14fd865a5120 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -1012,7 +1012,12 @@ static int pci_pm_thaw_noirq(struct device *dev) if (pci_has_legacy_pm_support(pci_dev)) return pci_legacy_resume_early(dev); - pci_update_current_state(pci_dev, PCI_D0); + /* + * pci_restore_state() requires the device to be in D0 (because of MSI + * restoration among other things), so force it into D0 in case the + * driver's "freeze" callbacks put it into a low-power state directly. + */ + pci_set_power_state(pci_dev, PCI_D0); pci_restore_state(pci_dev); if (drv && drv->pm && drv->pm->thaw_noirq) |