Merge tag 'for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI update from Bjorn Helgaas:
 "Host bridge hotplug:
   - Untangle _PRT from struct pci_bus (Bjorn Helgaas)
   - Request _OSC control before scanning root bus (Taku Izumi)
   - Assign resources when adding host bridge (Yinghai Lu)
   - Remove root bus when removing host bridge (Yinghai Lu)
   - Remove _PRT during hot remove (Yinghai Lu)

  SRIOV
    - Add sysfs knobs to control numVFs (Don Dutile)

  Power management
   - Notify devices when power resource turned on (Huang Ying)

  Bug fixes
   - Work around broken _SEG on HP xw9300 (Bjorn Helgaas)
   - Keep runtime PM enabled for unbound PCI devices (Huang Ying)
   - Fix Optimus dual-GPU runtime D3 suspend issue (Dave Airlie)
   - Fix xen frontend shutdown issue (David Vrabel)
   - Work around PLX PCI 9050 BAR alignment erratum (Ian Abbott)

  Miscellaneous
   - Add GPL license for drivers/pci/ioapic (Andrew Cooks)
   - Add standard PCI-X, PCIe ASPM register #defines (Bjorn Helgaas)
   - NumaChip remote PCI support (Daniel Blueman)
   - Fix PCIe Link Capabilities Supported Link Speed definition (Jingoo
     Han)
   - Convert dev_printk() to dev_info(), etc (Joe Perches)
   - Add support for non PCI BAR ROM data (Matthew Garrett)
   - Add x86 support for host bridge translation offset (Mike Yoknis)
   - Report success only when every driver supports AER (Vijay
     Pandarathil)"

Fix up trivial conflicts.

* tag 'for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (48 commits)
  PCI: Use phys_addr_t for physical ROM address
  x86/PCI: Add NumaChip remote PCI support
  ath9k: Use standard #defines for PCIe Capability ASPM fields
  iwlwifi: Use standard #defines for PCIe Capability ASPM fields
  iwlwifi: collapse wrapper for pcie_capability_read_word()
  iwlegacy: Use standard #defines for PCIe Capability ASPM fields
  iwlegacy: collapse wrapper for pcie_capability_read_word()
  cxgb3: Use standard #defines for PCIe Capability ASPM fields
  PCI: Add standard PCIe Capability Link ASPM field names
  PCI/portdrv: Use PCI Express Capability accessors
  PCI: Use standard PCIe Capability Link register field names
  x86: Use PCI setup data
  PCI: Add support for non-BAR ROMs
  PCI: Add pcibios_add_device
  EFI: Stash ROMs if they're not in the PCI BAR
  PCI: Add and use standard PCI-X Capability register names
  PCI/PM: Keep runtime PM enabled for unbound PCI devices
  xen-pcifront: Handle backend CLOSED without CLOSING
  PCI: SRIOV control and status via sysfs (documentation)
  PCI/AER: Report success only when every device has AER-aware driver
  ...

1 files changed, 43 insertions, 30 deletions

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 1dc78c5cabf8..f79cbcd3944b 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -248,31 +248,26 @@ struct drv_dev_and_id {
 static long local_pci_probe(void *_ddi)
 {
         struct drv_dev_and_id *ddi = _ddi;
-        struct device *dev = &ddi->dev->dev;
-        struct device *parent = dev->parent;
+        struct pci_dev *pci_dev = ddi->dev;
+        struct pci_driver *pci_drv = ddi->drv;
+        struct device *dev = &pci_dev->dev;
         int rc;
 
-        /* The parent bridge must be in active state when probing */
-        if (parent)
-                pm_runtime_get_sync(parent);
-        /* Unbound PCI devices are always set to disabled and suspended.
-         * During probe, the device is set to enabled and active and the
-         * usage count is incremented.  If the driver supports runtime PM,
-         * it should call pm_runtime_put_noidle() in its probe routine and
-         * pm_runtime_get_noresume() in its remove routine.
+        /*
+         * Unbound PCI devices are always put in D0, regardless of
+         * runtime PM status.  During probe, the device is set to
+         * active and the usage count is incremented.  If the driver
+         * supports runtime PM, it should call pm_runtime_put_noidle()
+         * in its probe routine and pm_runtime_get_noresume() in its
+         * remove routine.
          */
-        pm_runtime_get_noresume(dev);
-        pm_runtime_set_active(dev);
-        pm_runtime_enable(dev);
-
-        rc = ddi->drv->probe(ddi->dev, ddi->id);
+        pm_runtime_get_sync(dev);
+        pci_dev->driver = pci_drv;
+        rc = pci_drv->probe(pci_dev, ddi->id);
         if (rc) {
-                pm_runtime_disable(dev);
-                pm_runtime_set_suspended(dev);
-                pm_runtime_put_noidle(dev);
+                pci_dev->driver = NULL;
+                pm_runtime_put_sync(dev);
         }
-        if (parent)
-                pm_runtime_put(parent);
         return rc;
 }
 
@@ -322,10 +317,8 @@ __pci_device_probe(struct pci_driver *drv, struct pci_dev *pci_dev)
                 id = pci_match_device(drv, pci_dev);
                 if (id)
                         error = pci_call_probe(drv, pci_dev, id);
-                if (error >= 0) {
-                        pci_dev->driver = drv;
+                if (error >= 0)
                         error = 0;
-                }
         }
         return error;
 }
@@ -361,9 +354,7 @@ static int pci_device_remove(struct device * dev)
         }
 
         /* Undo the runtime PM settings in local_pci_probe() */
-        pm_runtime_disable(dev);
-        pm_runtime_set_suspended(dev);
-        pm_runtime_put_noidle(dev);
+        pm_runtime_put_sync(dev);
 
         /*
          * If the device is still on, set the power state as "unknown",
@@ -986,6 +977,13 @@ static int pci_pm_runtime_suspend(struct device *dev)
         pci_power_t prev = pci_dev->current_state;
         int error;
 
+        /*
+         * If pci_dev->driver is not set (unbound), the device should
+         * always remain in D0 regardless of the runtime PM status
+         */
+        if (!pci_dev->driver)
+                return 0;
+
         if (!pm || !pm->runtime_suspend)
                 return -ENOSYS;
 
@@ -1007,10 +1005,10 @@ static int pci_pm_runtime_suspend(struct device *dev)
                 return 0;
         }
 
-        if (!pci_dev->state_saved)
+        if (!pci_dev->state_saved) {
                 pci_save_state(pci_dev);
-
-        pci_finish_runtime_suspend(pci_dev);
+                pci_finish_runtime_suspend(pci_dev);
+        }
 
         return 0;
 }
@@ -1021,6 +1019,13 @@ static int pci_pm_runtime_resume(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 pci_dev->driver is not set (unbound), the device should
+         * always remain in D0 regardless of the runtime PM status
+         */
+        if (!pci_dev->driver)
+                return 0;
+
         if (!pm || !pm->runtime_resume)
                 return -ENOSYS;
 
@@ -1038,8 +1043,16 @@ static int pci_pm_runtime_resume(struct device *dev)
 
 static int pci_pm_runtime_idle(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 pci_dev->driver is not set (unbound), the device should
+         * always remain in D0 regardless of the runtime PM status
+         */
+        if (!pci_dev->driver)
+                goto out;
+
         if (!pm)
                 return -ENOSYS;
 
@@ -1049,8 +1062,8 @@ static int pci_pm_runtime_idle(struct device *dev)
                         return ret;
         }
 
+out:
         pm_runtime_suspend(dev);
-
         return 0;
 }