diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-29 19:29:45 +0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-29 19:29:45 +0800 |
| commit | 2407e486066b8ce00dabd7e2b3a2cbcc59ea6186 (patch) | |
| tree | 5e4fcdb178bcb824f8b3af6742b4221c3a889935 /drivers | |
| parent | Merge tag 'xarray-5.2-rc6' of git://git.infradead.org/users/willy/linux-dax (diff) | |
| parent | PCI: PM: Avoid skipping bus-level PM on platforms without ACPI (diff) | |
| download | linux-dev-2407e486066b8ce00dabd7e2b3a2cbcc59ea6186.tar.xz linux-dev-2407e486066b8ce00dabd7e2b3a2cbcc59ea6186.zip | |
Merge tag 'pm-5.2-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fix from Rafael Wysocki:
"Avoid skipping bus-level PCI power management during system resume for
PCIe ports left in D0 during the preceding suspend transition on
platforms where the power states of those ports can change out of the
PCI layer's control"
* tag 'pm-5.2-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PCI: PM: Avoid skipping bus-level PM on platforms without ACPI
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/pci-driver.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 98af9ecd4a90..ca3793002e2f 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -859,7 +859,7 @@ static int pci_pm_suspend_noirq(struct device *dev) pci_dev->bus->self->skip_bus_pm = true; } - if (pci_dev->skip_bus_pm && !pm_suspend_via_firmware()) { + if (pci_dev->skip_bus_pm && pm_suspend_no_platform()) { dev_dbg(dev, "PCI PM: Skipped\n"); goto Fixup; } @@ -914,10 +914,10 @@ static int pci_pm_resume_noirq(struct device *dev) /* * In the suspend-to-idle case, devices left in D0 during suspend will * stay in D0, so it is not necessary to restore or update their - * configuration here and attempting to put them into D0 again may - * confuse some firmware, so avoid doing that. + * configuration here and attempting to put them into D0 again is + * pointless, so avoid doing that. */ - if (!pci_dev->skip_bus_pm || pm_suspend_via_firmware()) + if (!(pci_dev->skip_bus_pm && pm_suspend_no_platform())) pci_pm_default_resume_early(pci_dev); pci_fixup_device(pci_fixup_resume_early, pci_dev); |