Merge back PM core material for v4.16.

1 files changed, 17 insertions, 2 deletions

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 945099d49f8f..9e53e51b91f3 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -699,7 +699,7 @@ static void pci_pm_complete(struct device *dev)
         pm_generic_complete(dev);
 
         /* Resume device if platform firmware has put it in reset-power-on */
-        if (dev->power.direct_complete && pm_resume_via_firmware()) {
+        if (pm_runtime_suspended(dev) && pm_resume_via_firmware()) {
                 pci_power_t pre_sleep_state = pci_dev->current_state;
 
                 pci_update_current_state(pci_dev, pci_dev->current_state);
@@ -783,8 +783,10 @@ static int pci_pm_suspend_noirq(struct device *dev)
         struct pci_dev *pci_dev = to_pci_dev(dev);
         const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
 
-        if (dev_pm_smart_suspend_and_suspended(dev))
+        if (dev_pm_smart_suspend_and_suspended(dev)) {
+                dev->power.may_skip_resume = true;
                 return 0;
+        }
 
         if (pci_has_legacy_pm_support(pci_dev))
                 return pci_legacy_suspend_late(dev, PMSG_SUSPEND);
@@ -838,6 +840,16 @@ static int pci_pm_suspend_noirq(struct device *dev)
 Fixup:
         pci_fixup_device(pci_fixup_suspend_late, pci_dev);
 
+        /*
+         * If the target system sleep state is suspend-to-idle, it is sufficient
+         * to check whether or not the device's wakeup settings are good for
+         * runtime PM.  Otherwise, the pm_resume_via_firmware() check will cause
+         * pci_pm_complete() to take care of fixing up the device's state
+         * anyway, if need be.
+         */
+        dev->power.may_skip_resume = device_may_wakeup(dev) ||
+                                        !device_can_wakeup(dev);
+
         return 0;
 }
 
@@ -847,6 +859,9 @@ static int pci_pm_resume_noirq(struct device *dev)
         struct device_driver *drv = dev->driver;
         int error = 0;
 
+        if (dev_pm_may_skip_resume(dev))
+                return 0;
+
         /*
          * Devices with DPM_FLAG_SMART_SUSPEND may be left in runtime suspend
          * during system suspend, so update their runtime PM status to "active"