1 files changed, 41 insertions, 46 deletions

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 9ab492f21f86..795c9026d55f 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -68,21 +68,6 @@ static int __init pcibus_class_init(void)
 }
 postcore_initcall(pcibus_class_init);
 
-/*
- * Translate the low bits of the PCI base
- * to the resource type
- */
-static inline unsigned int pci_calc_resource_flags(unsigned int flags)
-{
-        if (flags & PCI_BASE_ADDRESS_SPACE_IO)
-                return IORESOURCE_IO;
-
-        if (flags & PCI_BASE_ADDRESS_MEM_PREFETCH)
-                return IORESOURCE_MEM | IORESOURCE_PREFETCH;
-
-        return IORESOURCE_MEM;
-}
-
 static u64 pci_size(u64 base, u64 maxbase, u64 mask)
 {
         u64 size = mask & maxbase;      /* Find the significant bits */
@@ -101,18 +86,39 @@ static u64 pci_size(u64 base, u64 maxbase, u64 mask)
         return size;
 }
 
-static inline enum pci_bar_type decode_bar(struct resource *res, u32 bar)
+static inline unsigned long decode_bar(struct pci_dev *dev, u32 bar)
 {
+        u32 mem_type;
+        unsigned long flags;
+
         if ((bar & PCI_BASE_ADDRESS_SPACE) == PCI_BASE_ADDRESS_SPACE_IO) {
-                res->flags = bar & ~PCI_BASE_ADDRESS_IO_MASK;
-                return pci_bar_io;
+                flags = bar & ~PCI_BASE_ADDRESS_IO_MASK;
+                flags |= IORESOURCE_IO;
+                return flags;
         }
 
-        res->flags = bar & ~PCI_BASE_ADDRESS_MEM_MASK;
+        flags = bar & ~PCI_BASE_ADDRESS_MEM_MASK;
+        flags |= IORESOURCE_MEM;
+        if (flags & PCI_BASE_ADDRESS_MEM_PREFETCH)
+                flags |= IORESOURCE_PREFETCH;
 
-        if (res->flags & PCI_BASE_ADDRESS_MEM_TYPE_64)
-                return pci_bar_mem64;
-        return pci_bar_mem32;
+        mem_type = bar & PCI_BASE_ADDRESS_MEM_TYPE_MASK;
+        switch (mem_type) {
+        case PCI_BASE_ADDRESS_MEM_TYPE_32:
+                break;
+        case PCI_BASE_ADDRESS_MEM_TYPE_1M:
+                dev_info(&dev->dev, "1M mem BAR treated as 32-bit BAR\n");
+                break;
+        case PCI_BASE_ADDRESS_MEM_TYPE_64:
+                flags |= IORESOURCE_MEM_64;
+                break;
+        default:
+                dev_warn(&dev->dev,
+                         "mem unknown type %x treated as 32-bit BAR\n",
+                         mem_type);
+                break;
+        }
+        return flags;
 }
 
 /**
@@ -165,9 +171,9 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
                 l = 0;
 
         if (type == pci_bar_unknown) {
-                type = decode_bar(res, l);
-                res->flags |= pci_calc_resource_flags(l) | IORESOURCE_SIZEALIGN;
-                if (type == pci_bar_io) {
+                res->flags = decode_bar(dev, l);
+                res->flags |= IORESOURCE_SIZEALIGN;
+                if (res->flags & IORESOURCE_IO) {
                         l &= PCI_BASE_ADDRESS_IO_MASK;
                         mask = PCI_BASE_ADDRESS_IO_MASK & (u32) IO_SPACE_LIMIT;
                 } else {
@@ -180,7 +186,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
                 mask = (u32)PCI_ROM_ADDRESS_MASK;
         }
 
-        if (type == pci_bar_mem64) {
+        if (res->flags & IORESOURCE_MEM_64) {
                 u64 l64 = l;
                 u64 sz64 = sz;
                 u64 mask64 = mask | (u64)~0 << 32;
@@ -204,7 +210,6 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
                         goto fail;
                 }
 
-                res->flags |= IORESOURCE_MEM_64;
                 if ((sizeof(resource_size_t) < 8) && l) {
                         /* Address above 32-bit boundary; disable the BAR */
                         pci_write_config_dword(dev, pos, 0);
@@ -230,7 +235,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
         }
 
  out:
-        return (type == pci_bar_mem64) ? 1 : 0;
+        return (res->flags & IORESOURCE_MEM_64) ? 1 : 0;
  fail:
         res->flags = 0;
         goto out;
@@ -284,10 +289,6 @@ static void __devinit pci_read_bridge_io(struct pci_bus *child)
                 if (!res->end)
                         res->end = limit + 0xfff;
                 dev_printk(KERN_DEBUG, &dev->dev, "  bridge window %pR\n", res);
-        } else {
-                dev_printk(KERN_DEBUG, &dev->dev,
-                         "  bridge window [io  %#06lx-%#06lx] (disabled)\n",
-                                 base, limit);
         }
 }
 
@@ -308,10 +309,6 @@ static void __devinit pci_read_bridge_mmio(struct pci_bus *child)
                 res->start = base;
                 res->end = limit + 0xfffff;
                 dev_printk(KERN_DEBUG, &dev->dev, "  bridge window %pR\n", res);
-        } else {
-                dev_printk(KERN_DEBUG, &dev->dev,
-                        "  bridge window [mem %#010lx-%#010lx] (disabled)\n",
-                                         base, limit + 0xfffff);
         }
 }
 
@@ -359,10 +356,6 @@ static void __devinit pci_read_bridge_mmio_pref(struct pci_bus *child)
                 res->start = base;
                 res->end = limit + 0xfffff;
                 dev_printk(KERN_DEBUG, &dev->dev, "  bridge window %pR\n", res);
-        } else {
-                dev_printk(KERN_DEBUG, &dev->dev,
-                     "  bridge window [mem %#010lx-%#010lx pref] (disabled)\n",
-                                         base, limit + 0xfffff);
         }
 }
 
@@ -725,12 +718,14 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max,
                 pci_write_config_word(dev, PCI_STATUS, 0xffff);
 
                 /* Prevent assigning a bus number that already exists.
-                 * This can happen when a bridge is hot-plugged */
-                if (pci_find_bus(pci_domain_nr(bus), max+1))
-                        goto out;
-                child = pci_add_new_bus(bus, dev, ++max);
-                if (!child)
-                        goto out;
+                 * This can happen when a bridge is hot-plugged, so in
+                 * this case we only re-scan this bus. */
+                child = pci_find_bus(pci_domain_nr(bus), max+1);
+                if (!child) {
+                        child = pci_add_new_bus(bus, dev, ++max);
+                        if (!child)
+                                goto out;
+                }
                 buses = (buses & 0xff000000)
                       | ((unsigned int)(child->primary)     <<  0)
                       | ((unsigned int)(child->secondary)   <<  8)