Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 39 insertions, 35 deletions

diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index c54526b206b5..17bed18d24ad 100644
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -51,12 +51,6 @@ void pci_update_resource(struct pci_dev *dev, int resno)
 
         pcibios_resource_to_bus(dev, &region, res);
 
-        dev_dbg(&dev->dev, "BAR %d: got res %pR bus [%#llx-%#llx] "
-                "flags %#lx\n", resno, res,
-                 (unsigned long long)region.start,
-                 (unsigned long long)region.end,
-                 (unsigned long)res->flags);
-
         new = region.start | (res->flags & PCI_REGION_FLAG_MASK);
         if (res->flags & IORESOURCE_IO)
                 mask = (u32)PCI_BASE_ADDRESS_IO_MASK;
@@ -91,40 +85,39 @@ void pci_update_resource(struct pci_dev *dev, int resno)
                 }
         }
         res->flags &= ~IORESOURCE_UNSET;
-        dev_dbg(&dev->dev, "BAR %d: moved to bus [%#llx-%#llx] flags %#lx\n",
-                resno, (unsigned long long)region.start,
-                (unsigned long long)region.end, res->flags);
+        dev_info(&dev->dev, "BAR %d: set to %pR (PCI address [%#llx-%#llx]\n",
+                 resno, res, (unsigned long long)region.start,
+                 (unsigned long long)region.end);
 }
 
 int pci_claim_resource(struct pci_dev *dev, int resource)
 {
         struct resource *res = &dev->resource[resource];
-        struct resource *root;
-        int err;
+        struct resource *root, *conflict;
 
         root = pci_find_parent_resource(dev, res);
+        if (!root) {
+                dev_err(&dev->dev, "no compatible bridge window for %pR\n",
+                        res);
+                return -EINVAL;
+        }
 
-        err = -EINVAL;
-        if (root != NULL)
-                err = request_resource(root, res);
-
-        if (err) {
-                const char *dtype = resource < PCI_BRIDGE_RESOURCES ? "device" : "bridge";
-                dev_err(&dev->dev, "BAR %d: %s of %s %pR\n",
-                        resource,
-                        root ? "address space collision on" :
-                                "no parent found for",
-                        dtype, res);
+        conflict = request_resource_conflict(root, res);
+        if (conflict) {
+                dev_err(&dev->dev,
+                        "address space collision: %pR conflicts with %s %pR\n",
+                        res, conflict->name, conflict);
+                return -EBUSY;
         }
 
-        return err;
+        return 0;
 }
 EXPORT_SYMBOL(pci_claim_resource);
 
 #ifdef CONFIG_PCI_QUIRKS
 void pci_disable_bridge_window(struct pci_dev *dev)
 {
-        dev_dbg(&dev->dev, "Disabling bridge window.\n");
+        dev_info(&dev->dev, "disabling bridge mem windows\n");
 
         /* MMIO Base/Limit */
         pci_write_config_dword(dev, PCI_MEMORY_BASE, 0x0000fff0);
@@ -165,6 +158,7 @@ static int __pci_assign_resource(struct pci_bus *bus, struct pci_dev *dev,
 
         if (!ret) {
                 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);
         }
@@ -178,12 +172,12 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
         resource_size_t align;
         struct pci_bus *bus;
         int ret;
+        char *type;
 
         align = pci_resource_alignment(dev, res);
         if (!align) {
-                dev_info(&dev->dev, "BAR %d: can't allocate resource (bogus "
-                        "alignment) %pR flags %#lx\n",
-                        resno, res, res->flags);
+                dev_info(&dev->dev, "BAR %d: can't assign %pR "
+                         "(bogus alignment)\n", resno, res);
                 return -EINVAL;
         }
 
@@ -198,9 +192,20 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
                 break;
         }
 
-        if (ret)
-                dev_info(&dev->dev, "BAR %d: can't allocate %s resource %pR\n",
-                        resno, res->flags & IORESOURCE_IO ? "I/O" : "mem", res);
+        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;
 }
@@ -225,9 +230,8 @@ void pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)
 
                 r_align = pci_resource_alignment(dev, r);
                 if (!r_align) {
-                        dev_warn(&dev->dev, "BAR %d: bogus alignment "
-                                "%pR flags %#lx\n",
-                                i, r, r->flags);
+                        dev_warn(&dev->dev, "BAR %d: %pR has bogus alignment\n",
+                                 i, r);
                         continue;
                 }
                 for (list = head; ; list = list->next) {
@@ -274,8 +278,8 @@ int pci_enable_resources(struct pci_dev *dev, int mask)
                         continue;
 
                 if (!r->parent) {
-                        dev_err(&dev->dev, "device not available because of "
-                                "BAR %d %pR collisions\n", i, r);
+                        dev_err(&dev->dev, "device not available "
+                                "(can't reserve %pR)\n", r);
                         return -EINVAL;
                 }