1 files changed, 36 insertions, 39 deletions

diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index caed1ce6facd..b7c3a5ea1fca 100644
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -166,11 +166,10 @@ static int pci_revert_fw_address(struct resource *res, struct pci_dev *dev,
 {
         struct resource *root, *conflict;
         resource_size_t fw_addr, start, end;
-        int ret = 0;
 
         fw_addr = pcibios_retrieve_fw_addr(dev, resno);
         if (!fw_addr)
-                return 1;
+                return -ENOMEM;
 
         start = res->start;
         end = res->end;
@@ -189,14 +188,13 @@ static int pci_revert_fw_address(struct resource *res, struct pci_dev *dev,
                  resno, res);
         conflict = request_resource_conflict(root, res);
         if (conflict) {
-                dev_info(&dev->dev,
-                         "BAR %d: %pR conflicts with %s %pR\n", resno,
-                         res, conflict->name, conflict);
+                dev_info(&dev->dev, "BAR %d: %pR conflicts with %s %pR\n",
+                         resno, res, conflict->name, conflict);
                 res->start = start;
                 res->end = end;
-                ret = 1;
+                return -EBUSY;
         }
-        return ret;
+        return 0;
 }
 
 static int __pci_assign_resource(struct pci_bus *bus, struct pci_dev *dev,
@@ -250,10 +248,8 @@ static int __pci_assign_resource(struct pci_bus *bus, struct pci_dev *dev,
 static int _pci_assign_resource(struct pci_dev *dev, int resno,
                                 resource_size_t size, resource_size_t min_align)
 {
-        struct resource *res = dev->resource + resno;
         struct pci_bus *bus;
         int ret;
-        char *type;
 
         bus = dev->bus;
         while ((ret = __pci_assign_resource(bus, dev, resno, size, min_align))) {
@@ -262,21 +258,6 @@ static int _pci_assign_resource(struct pci_dev *dev, int resno,
                 bus = bus->parent;
         }
 
-        if (ret) {
-                if (res->flags & IORESOURCE_MEM)
-                        if (res->flags & IORESOURCE_PREFETCH)
-                                type = "mem pref";
-                        else
-                                type = "mem";
-                else if (res->flags & IORESOURCE_IO)
-                        type = "io";
-                else
-                        type = "unknown";
-                dev_info(&dev->dev,
-                         "BAR %d: can't assign %s (size %#llx)\n",
-                         resno, type, (unsigned long long) resource_size(res));
-        }
-
         return ret;
 }
 
@@ -302,17 +283,24 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
          * where firmware left it.  That at least has a chance of
          * working, which is better than just leaving it disabled.
          */
-        if (ret < 0)
+        if (ret < 0) {
+                dev_info(&dev->dev, "BAR %d: no space for %pR\n", resno, res);
                 ret = pci_revert_fw_address(res, dev, resno, size);
+        }
 
-        if (!ret) {
-                res->flags &= ~IORESOURCE_UNSET;
-                res->flags &= ~IORESOURCE_STARTALIGN;
-                dev_info(&dev->dev, "BAR %d: assigned %pR\n", resno, res);
-                if (resno < PCI_BRIDGE_RESOURCES)
-                        pci_update_resource(dev, resno);
+        if (ret < 0) {
+                dev_info(&dev->dev, "BAR %d: failed to assign %pR\n", resno,
+                         res);
+                return ret;
         }
-        return ret;
+
+        res->flags &= ~IORESOURCE_UNSET;
+        res->flags &= ~IORESOURCE_STARTALIGN;
+        dev_info(&dev->dev, "BAR %d: assigned %pR\n", resno, res);
+        if (resno < PCI_BRIDGE_RESOURCES)
+                pci_update_resource(dev, resno);
+
+        return 0;
 }
 EXPORT_SYMBOL(pci_assign_resource);
 
@@ -320,9 +308,11 @@ int pci_reassign_resource(struct pci_dev *dev, int resno, resource_size_t addsiz
                         resource_size_t min_align)
 {
         struct resource *res = dev->resource + resno;
+        unsigned long flags;
         resource_size_t new_size;
         int ret;
 
+        flags = res->flags;
         res->flags |= IORESOURCE_UNSET;
         if (!res->parent) {
                 dev_info(&dev->dev, "BAR %d: can't reassign an unassigned resource %pR\n",
@@ -333,14 +323,21 @@ int pci_reassign_resource(struct pci_dev *dev, int resno, resource_size_t addsiz
         /* already aligned with min_align */
         new_size = resource_size(res) + addsize;
         ret = _pci_assign_resource(dev, resno, new_size, min_align);
-        if (!ret) {
-                res->flags &= ~IORESOURCE_UNSET;
-                res->flags &= ~IORESOURCE_STARTALIGN;
-                dev_info(&dev->dev, "BAR %d: reassigned %pR\n", resno, res);
-                if (resno < PCI_BRIDGE_RESOURCES)
-                        pci_update_resource(dev, resno);
+        if (ret) {
+                res->flags = flags;
+                dev_info(&dev->dev, "BAR %d: %pR (failed to expand by %#llx)\n",
+                         resno, res, (unsigned long long) addsize);
+                return ret;
         }
-        return ret;
+
+        res->flags &= ~IORESOURCE_UNSET;
+        res->flags &= ~IORESOURCE_STARTALIGN;
+        dev_info(&dev->dev, "BAR %d: reassigned %pR (expanded by %#llx)\n",
+                 resno, res, (unsigned long long) addsize);
+        if (resno < PCI_BRIDGE_RESOURCES)
+                pci_update_resource(dev, resno);
+
+        return 0;
 }
 
 int pci_enable_resources(struct pci_dev *dev, int mask)