Merge 3.3-rc6 into driver-core-next

This was done to resolve a conflict in the drivers/base/cpu.c file.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

4 files changed, 33 insertions, 13 deletions

diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index 0321fa3b4226..0dab5ecf61bb 100644
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
@@ -347,8 +347,6 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn)
                         return rc;
         }
 
-        pci_write_config_dword(dev, iov->pos + PCI_SRIOV_SYS_PGSIZE, iov->pgsz);
-
         iov->ctrl |= PCI_SRIOV_CTRL_VFE | PCI_SRIOV_CTRL_MSE;
         pci_cfg_access_lock(dev);
         pci_write_config_word(dev, iov->pos + PCI_SRIOV_CTRL, iov->ctrl);
@@ -466,6 +464,7 @@ found:
                 return -EIO;
 
         pgsz &= ~(pgsz - 1);
+        pci_write_config_dword(dev, pos + PCI_SRIOV_SYS_PGSIZE, pgsz);
 
         nres = 0;
         for (i = 0; i < PCI_SRIOV_NUM_BARS; i++) {
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 7cc9e2f0f47c..71eac9cd724d 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -651,6 +651,11 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max,
         dev_dbg(&dev->dev, "scanning [bus %02x-%02x] behind bridge, pass %d\n",
                 secondary, subordinate, pass);
 
+        if (!primary && (primary != bus->number) && secondary && subordinate) {
+                dev_warn(&dev->dev, "Primary bus is hard wired to 0\n");
+                primary = bus->number;
+        }
+
         /* Check if setup is sensible at all */
         if (!pass &&
             (primary != bus->number || secondary <= bus->number)) {
diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
index 6def3624c688..ef8b18c48f26 100644
--- a/drivers/pci/remove.c
+++ b/drivers/pci/remove.c
@@ -77,6 +77,7 @@ void pci_remove_bus(struct pci_bus *pci_bus)
 }
 EXPORT_SYMBOL(pci_remove_bus);
 
+static void __pci_remove_behind_bridge(struct pci_dev *dev);
 /**
  * pci_remove_bus_device - remove a PCI device and any children
  * @dev: the device to remove
@@ -94,7 +95,7 @@ static void __pci_remove_bus_device(struct pci_dev *dev)
         if (dev->subordinate) {
                 struct pci_bus *b = dev->subordinate;
 
-                pci_remove_behind_bridge(dev);
+                __pci_remove_behind_bridge(dev);
                 pci_remove_bus(b);
                 dev->subordinate = NULL;
         }
@@ -107,6 +108,24 @@ void pci_remove_bus_device(struct pci_dev *dev)
         __pci_remove_bus_device(dev);
 }
 
+static void __pci_remove_behind_bridge(struct pci_dev *dev)
+{
+        struct list_head *l, *n;
+
+        if (dev->subordinate)
+                list_for_each_safe(l, n, &dev->subordinate->devices)
+                        __pci_remove_bus_device(pci_dev_b(l));
+}
+
+static void pci_stop_behind_bridge(struct pci_dev *dev)
+{
+        struct list_head *l, *n;
+
+        if (dev->subordinate)
+                list_for_each_safe(l, n, &dev->subordinate->devices)
+                        pci_stop_bus_device(pci_dev_b(l));
+}
+
 /**
  * pci_remove_behind_bridge - remove all devices behind a PCI bridge
  * @dev: PCI bridge device
@@ -117,11 +136,8 @@ void pci_remove_bus_device(struct pci_dev *dev)
  */
 void pci_remove_behind_bridge(struct pci_dev *dev)
 {
-        struct list_head *l, *n;
-
-        if (dev->subordinate)
-                list_for_each_safe(l, n, &dev->subordinate->devices)
-                        __pci_remove_bus_device(pci_dev_b(l));
+        pci_stop_behind_bridge(dev);
+        __pci_remove_behind_bridge(dev);
 }
 
 static void pci_stop_bus_devices(struct pci_bus *bus)
diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
index 98387caf59b3..401090110922 100644
--- a/drivers/pci/xen-pcifront.c
+++ b/drivers/pci/xen-pcifront.c
@@ -189,7 +189,7 @@ static int pcifront_bus_read(struct pci_bus *bus, unsigned int devfn,
 
         if (verbose_request)
                 dev_info(&pdev->xdev->dev,
-                         "read dev=%04x:%02x:%02x.%01x - offset %x size %d\n",
+                         "read dev=%04x:%02x:%02x.%d - offset %x size %d\n",
                          pci_domain_nr(bus), bus->number, PCI_SLOT(devfn),
                          PCI_FUNC(devfn), where, size);
 
@@ -228,7 +228,7 @@ static int pcifront_bus_write(struct pci_bus *bus, unsigned int devfn,
 
         if (verbose_request)
                 dev_info(&pdev->xdev->dev,
-                         "write dev=%04x:%02x:%02x.%01x - "
+                         "write dev=%04x:%02x:%02x.%d - "
                          "offset %x size %d val %x\n",
                          pci_domain_nr(bus), bus->number,
                          PCI_SLOT(devfn), PCI_FUNC(devfn), where, size, val);
@@ -432,7 +432,7 @@ static int __devinit pcifront_scan_bus(struct pcifront_device *pdev,
                 d = pci_scan_single_device(b, devfn);
                 if (d)
                         dev_info(&pdev->xdev->dev, "New device on "
-                                 "%04x:%02x:%02x.%02x found.\n", domain, bus,
+                                 "%04x:%02x:%02x.%d found.\n", domain, bus,
                                  PCI_SLOT(devfn), PCI_FUNC(devfn));
         }
 
@@ -1040,7 +1040,7 @@ static int pcifront_detach_devices(struct pcifront_device *pdev)
                 pci_dev = pci_get_slot(pci_bus, PCI_DEVFN(slot, func));
                 if (!pci_dev) {
                         dev_dbg(&pdev->xdev->dev,
-                                "Cannot get PCI device %04x:%02x:%02x.%02x\n",
+                                "Cannot get PCI device %04x:%02x:%02x.%d\n",
                                 domain, bus, slot, func);
                         continue;
                 }
@@ -1048,7 +1048,7 @@ static int pcifront_detach_devices(struct pcifront_device *pdev)
                 pci_dev_put(pci_dev);
 
                 dev_dbg(&pdev->xdev->dev,
-                        "PCI device %04x:%02x:%02x.%02x removed.\n",
+                        "PCI device %04x:%02x:%02x.%d removed.\n",
                         domain, bus, slot, func);
         }