Merge back PCI power management material for v5.3.

1 files changed, 18 insertions, 4 deletions

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 98af9ecd4a90..bd097ea5925c 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -678,6 +678,7 @@ static bool pci_has_legacy_pm_support(struct pci_dev *pci_dev)
 static int pci_pm_prepare(struct device *dev)
 {
         struct device_driver *drv = dev->driver;
+        struct pci_dev *pci_dev = to_pci_dev(dev);
 
         if (drv && drv->pm && drv->pm->prepare) {
                 int error = drv->pm->prepare(dev);
@@ -687,7 +688,15 @@ static int pci_pm_prepare(struct device *dev)
                 if (!error && dev_pm_test_driver_flags(dev, DPM_FLAG_SMART_PREPARE))
                         return 0;
         }
-        return pci_dev_keep_suspended(to_pci_dev(dev));
+        if (pci_dev_need_resume(pci_dev))
+                return 0;
+
+        /*
+         * The PME setting needs to be adjusted here in case the direct-complete
+         * optimization is used with respect to this device.
+         */
+        pci_dev_adjust_pme(pci_dev);
+        return 1;
 }
 
 static void pci_pm_complete(struct device *dev)
@@ -757,9 +766,11 @@ static int pci_pm_suspend(struct device *dev)
          * better to resume the device from runtime suspend here.
          */
         if (!dev_pm_test_driver_flags(dev, DPM_FLAG_SMART_SUSPEND) ||
-            !pci_dev_keep_suspended(pci_dev)) {
+            pci_dev_need_resume(pci_dev)) {
                 pm_runtime_resume(dev);
                 pci_dev->state_saved = false;
+        } else {
+                pci_dev_adjust_pme(pci_dev);
         }
 
         if (pm->suspend) {
@@ -1130,10 +1141,13 @@ static int pci_pm_poweroff(struct device *dev)
 
         /* The reason to do that is the same as in pci_pm_suspend(). */
         if (!dev_pm_test_driver_flags(dev, DPM_FLAG_SMART_SUSPEND) ||
-            !pci_dev_keep_suspended(pci_dev))
+            pci_dev_need_resume(pci_dev)) {
                 pm_runtime_resume(dev);
+                pci_dev->state_saved = false;
+        } else {
+                pci_dev_adjust_pme(pci_dev);
+        }
 
-        pci_dev->state_saved = false;
         if (pm->poweroff) {
                 int error;