Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (98 commits)
  PCI PM: Put PM callbacks in the order of execution
  PCI PM: Run default PM callbacks for all devices using new framework
  PCI PM: Register power state of devices during initialization
  PCI PM: Call pci_fixup_device from legacy routines
  PCI PM: Rearrange code in pci-driver.c
  PCI PM: Avoid touching devices behind bridges in unknown state
  PCI PM: Move pci_has_legacy_pm_support
  PCI PM: Power-manage devices without drivers during suspend-resume
  PCI PM: Add suspend counterpart of pci_reenable_device
  PCI PM: Fix poweroff and restore callbacks
  PCI: Use msleep instead of cpu_relax during ASPM link retraining
  PCI: PCIe portdrv: Add kerneldoc comments to remining core funtions
  PCI: PCIe portdrv: Rearrange code so that related things are together
  PCI: PCIe portdrv: Fix suspend and resume of PCI Express port services
  PCI: PCIe portdrv: Add kerneldoc comments to some core functions
  x86/PCI: Do not use interrupt links for devices using MSI-X
  net: sfc: Use pci_clear_master() to disable bus mastering
  PCI: Add pci_clear_master() as opposite of pci_set_master()
  PCI hotplug: remove redundant test in cpq hotplug
  PCI: pciehp: cleanup register and field definitions
  ...

9 files changed, 48 insertions, 58 deletions

diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index 19a1044a0cd9..b25428533141 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -38,7 +38,7 @@ EXPORT_SYMBOL(bad_dma_address);
    be probably a smaller DMA mask, but this is bug-to-bug compatible
    to older i386. */
 struct device x86_dma_fallback_dev = {
-        .bus_id = "fallback device",
+        .init_name = "fallback device",
         .coherent_dma_mask = DMA_32BIT_MASK,
         .dma_mask = &x86_dma_fallback_dev.coherent_dma_mask,
 };
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 544d724caeee..88f1b10de3be 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -328,6 +328,8 @@ int devmem_is_allowed(unsigned long pagenr)
 {
         if (pagenr <= 256)
                 return 1;
+        if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
+                return 0;
         if (!page_is_ram(pagenr))
                 return 1;
         return 0;
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 54c437e96541..23f68e77ad1f 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -888,6 +888,8 @@ int devmem_is_allowed(unsigned long pagenr)
 {
         if (pagenr <= 256)
                 return 1;
+        if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
+                return 0;
         if (!page_is_ram(pagenr))
                 return 1;
         return 0;
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 9e5752fe4d15..c0ecf250fe51 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -210,11 +210,10 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int do
         if (bus && node != -1) {
 #ifdef CONFIG_ACPI_NUMA
                 if (pxm >= 0)
-                        printk(KERN_DEBUG "bus %02x -> pxm %d -> node %d\n",
-                                busnum, pxm, node);
+                        dev_printk(KERN_DEBUG, &bus->dev,
+                                   "on NUMA node %d (pxm %d)\n", node, pxm);
 #else
-                printk(KERN_DEBUG "bus %02x -> node %d\n",
-                        busnum, node);
+                dev_printk(KERN_DEBUG, &bus->dev, "on NUMA node %d\n", node);
 #endif
         }
 
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 62ddb73e09ed..82d22fc601ae 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -551,17 +551,25 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
         if ((err = pci_enable_resources(dev, mask)) < 0)
                 return err;
 
-        if (!dev->msi_enabled)
+        if (!pci_dev_msi_enabled(dev))
                 return pcibios_enable_irq(dev);
         return 0;
 }
 
 void pcibios_disable_device (struct pci_dev *dev)
 {
-        if (!dev->msi_enabled && pcibios_disable_irq)
+        if (!pci_dev_msi_enabled(dev) && pcibios_disable_irq)
                 pcibios_disable_irq(dev);
 }
 
+int pci_ext_cfg_avail(struct pci_dev *dev)
+{
+        if (raw_pci_ext_ops)
+                return 1;
+        else
+                return 0;
+}
+
 struct pci_bus * __devinit pci_scan_bus_on_node(int busno, struct pci_ops *ops, int node)
 {
         struct pci_bus *bus = NULL;
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index e51bf2cda4b0..f884740da318 100644
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -129,7 +129,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list)
                                 pr = pci_find_parent_resource(dev, r);
                                 if (!r->start || !pr ||
                                     request_resource(pr, r) < 0) {
-                                        dev_err(&dev->dev, "BAR %d: can't allocate resource\n", idx);
+                                        dev_info(&dev->dev, "BAR %d: can't allocate resource\n", idx);
                                         /*
                                          * Something is wrong with the region.
                                          * Invalidate the resource to prevent
@@ -170,7 +170,7 @@ static void __init pcibios_allocate_resources(int pass)
                                         r->flags, disabled, pass);
                                 pr = pci_find_parent_resource(dev, r);
                                 if (!pr || request_resource(pr, r) < 0) {
-                                        dev_err(&dev->dev, "BAR %d: can't allocate resource\n", idx);
+                                        dev_info(&dev->dev, "BAR %d: can't allocate resource\n", idx);
                                         /* We'll assign a new address later */
                                         r->end -= r->start;
                                         r->start = 0;
diff --git a/arch/x86/pci/init.c b/arch/x86/pci/init.c
index bec3b048e72b..25a1f8efed4a 100644
--- a/arch/x86/pci/init.c
+++ b/arch/x86/pci/init.c
@@ -12,7 +12,8 @@ static __init int pci_arch_init(void)
         type = pci_direct_probe();
 #endif
 
-        pci_mmcfg_early_init();
+        if (!(pci_probe & PCI_PROBE_NOEARLY))
+                pci_mmcfg_early_init();
 
 #ifdef CONFIG_PCI_OLPC
         if (!pci_olpc_init())
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
index 373b9afe6d44..4064345cf144 100644
--- a/arch/x86/pci/irq.c
+++ b/arch/x86/pci/irq.c
@@ -533,7 +533,7 @@ static int pirq_bios_set(struct pci_dev *router, struct pci_dev *dev, int pirq,
 {
         struct pci_dev *bridge;
         int pin = pci_get_interrupt_pin(dev, &bridge);
-        return pcibios_set_irq_routing(bridge, pin, irq);
+        return pcibios_set_irq_routing(bridge, pin - 1, irq);
 }
 
 #endif
@@ -887,7 +887,6 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign)
                 dev_dbg(&dev->dev, "no interrupt pin\n");
                 return 0;
         }
-        pin = pin - 1;
 
         /* Find IRQ routing entry */
 
@@ -897,17 +896,17 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign)
         info = pirq_get_info(dev);
         if (!info) {
                 dev_dbg(&dev->dev, "PCI INT %c not found in routing table\n",
-                        'A' + pin);
+                        'A' + pin - 1);
                 return 0;
         }
-        pirq = info->irq[pin].link;
-        mask = info->irq[pin].bitmap;
+        pirq = info->irq[pin - 1].link;
+        mask = info->irq[pin - 1].bitmap;
         if (!pirq) {
-                dev_dbg(&dev->dev, "PCI INT %c not routed\n", 'A' + pin);
+                dev_dbg(&dev->dev, "PCI INT %c not routed\n", 'A' + pin - 1);
                 return 0;
         }
         dev_dbg(&dev->dev, "PCI INT %c -> PIRQ %02x, mask %04x, excl %04x",
-                'A' + pin, pirq, mask, pirq_table->exclusive_irqs);
+                'A' + pin - 1, pirq, mask, pirq_table->exclusive_irqs);
         mask &= pcibios_irq_mask;
 
         /* Work around broken HP Pavilion Notebooks which assign USB to
@@ -949,7 +948,7 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign)
                                 newirq = i;
                 }
         }
-        dev_dbg(&dev->dev, "PCI INT %c -> newirq %d", 'A' + pin, newirq);
+        dev_dbg(&dev->dev, "PCI INT %c -> newirq %d", 'A' + pin - 1, newirq);
 
         /* Check if it is hardcoded */
         if ((pirq & 0xf0) == 0xf0) {
@@ -977,18 +976,18 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign)
                         return 0;
                 }
         }
-        dev_info(&dev->dev, "%s PCI INT %c -> IRQ %d\n", msg, 'A' + pin, irq);
+        dev_info(&dev->dev, "%s PCI INT %c -> IRQ %d\n", msg, 'A' + pin - 1, irq);
 
         /* Update IRQ for all devices with the same pirq value */
         while ((dev2 = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev2)) != NULL) {
                 pci_read_config_byte(dev2, PCI_INTERRUPT_PIN, &pin);
                 if (!pin)
                         continue;
-                pin--;
+
                 info = pirq_get_info(dev2);
                 if (!info)
                         continue;
-                if (info->irq[pin].link == pirq) {
+                if (info->irq[pin - 1].link == pirq) {
                         /*
                          * We refuse to override the dev->irq
                          * information. Give a warning!
@@ -1042,6 +1041,9 @@ static void __init pcibios_fixup_irqs(void)
         dev = NULL;
         while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
                 pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
+                if (!pin)
+                        continue;
+
 #ifdef CONFIG_X86_IO_APIC
                 /*
                  * Recalculate IRQ numbers if we use the I/O APIC.
@@ -1049,15 +1051,11 @@ static void __init pcibios_fixup_irqs(void)
                 if (io_apic_assign_pci_irqs) {
                         int irq;
 
-                        if (!pin)
-                                continue;
-
                         /*
                          * interrupt pins are numbered starting from 1
                          */
-                        pin--;
                         irq = IO_APIC_get_PCI_irq_vector(dev->bus->number,
-                                PCI_SLOT(dev->devfn), pin);
+                                PCI_SLOT(dev->devfn), pin - 1);
                         /*
                          * Busses behind bridges are typically not listed in the
                          * MP-table.  In this case we have to look up the IRQ
@@ -1070,22 +1068,22 @@ static void __init pcibios_fixup_irqs(void)
                                 struct pci_dev *bridge = dev->bus->self;
                                 int bus;
 
-                                pin = (pin + PCI_SLOT(dev->devfn)) % 4;
+                                pin = pci_swizzle_interrupt_pin(dev, pin);
                                 bus = bridge->bus->number;
                                 irq = IO_APIC_get_PCI_irq_vector(bus,
-                                                PCI_SLOT(bridge->devfn), pin);
+                                                PCI_SLOT(bridge->devfn), pin - 1);
                                 if (irq >= 0)
                                         dev_warn(&dev->dev,
                                                 "using bridge %s INT %c to "
                                                         "get IRQ %d\n",
                                                  pci_name(bridge),
-                                                 'A' + pin, irq);
+                                                 'A' + pin - 1, irq);
                         }
                         if (irq >= 0) {
                                 dev_info(&dev->dev,
                                         "PCI->APIC IRQ transform: INT %c "
                                                 "-> IRQ %d\n",
-                                        'A' + pin, irq);
+                                        'A' + pin - 1, irq);
                                 dev->irq = irq;
                         }
                 }
@@ -1093,7 +1091,7 @@ static void __init pcibios_fixup_irqs(void)
                 /*
                  * Still no IRQ? Try to lookup one...
                  */
-                if (pin && !dev->irq)
+                if (!dev->irq)
                         pcibios_lookup_irq(dev, 0);
         }
 }
@@ -1220,12 +1218,10 @@ static int pirq_enable_irq(struct pci_dev *dev)
         if (pin && !pcibios_lookup_irq(dev, 1) && !dev->irq) {
                 char *msg = "";
 
-                pin--; /* interrupt pins are numbered starting from 1 */
-
                 if (io_apic_assign_pci_irqs) {
                         int irq;
 
-                        irq = IO_APIC_get_PCI_irq_vector(dev->bus->number, PCI_SLOT(dev->devfn), pin);
+                        irq = IO_APIC_get_PCI_irq_vector(dev->bus->number, PCI_SLOT(dev->devfn), pin - 1);
                         /*
                          * Busses behind bridges are typically not listed in the MP-table.
                          * In this case we have to look up the IRQ based on the parent bus,
@@ -1236,20 +1232,20 @@ static int pirq_enable_irq(struct pci_dev *dev)
                         while (irq < 0 && dev->bus->parent) { /* go back to the bridge */
                                 struct pci_dev *bridge = dev->bus->self;
 
-                                pin = (pin + PCI_SLOT(dev->devfn)) % 4;
+                                pin = pci_swizzle_interrupt_pin(dev, pin);
                                 irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number,
-                                                PCI_SLOT(bridge->devfn), pin);
+                                                PCI_SLOT(bridge->devfn), pin - 1);
                                 if (irq >= 0)
                                         dev_warn(&dev->dev, "using bridge %s "
                                                  "INT %c to get IRQ %d\n",
-                                                 pci_name(bridge), 'A' + pin,
+                                                 pci_name(bridge), 'A' + pin - 1,
                                                  irq);
                                 dev = bridge;
                         }
                         dev = temp_dev;
                         if (irq >= 0) {
                                 dev_info(&dev->dev, "PCI->APIC IRQ transform: "
-                                         "INT %c -> IRQ %d\n", 'A' + pin, irq);
+                                         "INT %c -> IRQ %d\n", 'A' + pin - 1, irq);
                                 dev->irq = irq;
                                 return 0;
                         } else
@@ -1268,7 +1264,7 @@ static int pirq_enable_irq(struct pci_dev *dev)
                         return 0;
 
                 dev_warn(&dev->dev, "can't find IRQ for PCI INT %c%s\n",
-                         'A' + pin, msg);
+                         'A' + pin - 1, msg);
         }
         return 0;
 }
diff --git a/arch/x86/pci/visws.c b/arch/x86/pci/visws.c
index 16d0c0eb0d19..bcead7a46871 100644
--- a/arch/x86/pci/visws.c
+++ b/arch/x86/pci/visws.c
@@ -24,24 +24,6 @@ static void pci_visws_disable_irq(struct pci_dev *dev) { }
 
 unsigned int pci_bus0, pci_bus1;
 
-static inline u8 bridge_swizzle(u8 pin, u8 slot) 
-{
-        return (((pin - 1) + slot) % 4) + 1;
-}
-
-static u8 __init visws_swizzle(struct pci_dev *dev, u8 *pinp)
-{
-        u8 pin = *pinp;
-
-        while (dev->bus->self) {        /* Move up the chain of bridges. */
-                pin = bridge_swizzle(pin, PCI_SLOT(dev->devfn));
-                dev = dev->bus->self;
-        }
-        *pinp = pin;
-
-        return PCI_SLOT(dev->devfn);
-}
-
 static int __init visws_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
         int irq, bus = dev->bus->number;
@@ -106,7 +88,7 @@ int __init pci_visws_init(void)
         raw_pci_ops = &pci_direct_conf1;
         pci_scan_bus_with_sysdata(pci_bus0);
         pci_scan_bus_with_sysdata(pci_bus1);
-        pci_fixup_irqs(visws_swizzle, visws_map_irq);
+        pci_fixup_irqs(pci_common_swizzle, visws_map_irq);
         pcibios_resource_survey();
         return 0;
 }