19 files changed, 48 insertions, 138 deletions

diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c
index 82f738e5d54c..cded02c890aa 100644
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
@@ -242,12 +242,7 @@ pci_restore_srm_config(void)
 
 void pcibios_fixup_bus(struct pci_bus *bus)
 {
-        struct pci_dev *dev = bus->self;
-
-        if (pci_has_flag(PCI_PROBE_ONLY) && dev &&
-                   (dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {
-                pci_read_bridge_bases(bus);
-        } 
+        struct pci_dev *dev;
 
         list_for_each_entry(dev, &bus->devices, bus_list) {
                 pdev_save_srm_config(dev);
diff --git a/arch/arm64/boot/dts/apm/apm-storm.dtsi b/arch/arm64/boot/dts/apm/apm-storm.dtsi
index 0689c3fb56e3..b49482e3ca9c 100644
--- a/arch/arm64/boot/dts/apm/apm-storm.dtsi
+++ b/arch/arm64/boot/dts/apm/apm-storm.dtsi
@@ -490,7 +490,8 @@
                                 0xe0 0xd0000000 0x0 0x00040000>; /* PCI config space */
                         reg-names = "csr", "cfg";
                         ranges = <0x01000000 0x00 0x00000000 0xe0 0x10000000 0x00 0x00010000   /* io */
-                                  0x02000000 0x00 0x80000000 0xe1 0x80000000 0x00 0x80000000>; /* mem */
+                                  0x02000000 0x00 0x80000000 0xe1 0x80000000 0x00 0x80000000   /* mem */
+                                  0x43000000 0xf0 0x00000000 0xf0 0x00000000 0x10 0x00000000>; /* mem */
                         dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000
                                       0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>;
                         interrupt-map-mask = <0x0 0x0 0x0 0x7>;
@@ -513,8 +514,9 @@
                         reg = < 0x00 0x1f2c0000 0x0 0x00010000   /* Controller registers */
                                 0xd0 0xd0000000 0x0 0x00040000>; /* PCI config space */
                         reg-names = "csr", "cfg";
-                        ranges = <0x01000000 0x0 0x00000000 0xd0 0x10000000 0x00 0x00010000   /* io  */
-                                  0x02000000 0x0 0x80000000 0xd1 0x80000000 0x00 0x80000000>; /* mem */
+                        ranges = <0x01000000 0x00 0x00000000 0xd0 0x10000000 0x00 0x00010000   /* io  */
+                                  0x02000000 0x00 0x80000000 0xd1 0x80000000 0x00 0x80000000   /* mem */
+                                  0x43000000 0xd8 0x00000000 0xd8 0x00000000 0x08 0x00000000>; /* mem */
                         dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000
                                       0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>;
                         interrupt-map-mask = <0x0 0x0 0x0 0x7>;
@@ -537,8 +539,9 @@
                         reg =  < 0x00 0x1f2d0000 0x0 0x00010000   /* Controller registers */
                                  0x90 0xd0000000 0x0 0x00040000>; /* PCI config space */
                         reg-names = "csr", "cfg";
-                        ranges = <0x01000000 0x0 0x00000000 0x90 0x10000000 0x0 0x00010000   /* io  */
-                                  0x02000000 0x0 0x80000000 0x91 0x80000000 0x0 0x80000000>; /* mem */
+                        ranges = <0x01000000 0x00 0x00000000 0x90 0x10000000 0x00 0x00010000   /* io  */
+                                  0x02000000 0x00 0x80000000 0x91 0x80000000 0x00 0x80000000   /* mem */
+                                  0x43000000 0x94 0x00000000 0x94 0x00000000 0x04 0x00000000>; /* mem */
                         dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000
                                       0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>;
                         interrupt-map-mask = <0x0 0x0 0x0 0x7>;
@@ -561,8 +564,9 @@
                         reg = < 0x00 0x1f500000 0x0 0x00010000   /* Controller registers */
                                 0xa0 0xd0000000 0x0 0x00040000>; /* PCI config space */
                         reg-names = "csr", "cfg";
-                        ranges = <0x01000000 0x0 0x00000000 0xa0 0x10000000 0x0 0x00010000   /* io   */
-                                  0x02000000 0x0 0x80000000 0xa1 0x80000000 0x0 0x80000000>; /* mem  */
+                        ranges = <0x01000000 0x00 0x00000000 0xa0 0x10000000 0x00 0x00010000   /* io  */
+                                  0x02000000 0x00 0x80000000 0xa1 0x80000000 0x00 0x80000000   /* mem */
+                                  0x43000000 0xb0 0x00000000 0xb0 0x00000000 0x10 0x00000000>; /* mem */
                         dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000
                                       0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>;
                         interrupt-map-mask = <0x0 0x0 0x0 0x7>;
@@ -585,8 +589,9 @@
                         reg = < 0x00 0x1f510000 0x0 0x00010000   /* Controller registers */
                                 0xc0 0xd0000000 0x0 0x00200000>; /* PCI config space */
                         reg-names = "csr", "cfg";
-                        ranges = <0x01000000 0x0 0x00000000 0xc0 0x10000000 0x0 0x00010000   /* io  */
-                                  0x02000000 0x0 0x80000000 0xc1 0x80000000 0x0 0x80000000>; /* mem */
+                        ranges = <0x01000000 0x00 0x00000000 0xc0 0x10000000 0x00 0x00010000   /* io  */
+                                  0x02000000 0x00 0x80000000 0xc1 0x80000000 0x00 0x80000000   /* mem */
+                                  0x43000000 0xc8 0x00000000 0xc8 0x00000000 0x08 0x00000000>; /* mem */
                         dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000
                                       0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>;
                         interrupt-map-mask = <0x0 0x0 0x0 0x7>;
diff --git a/arch/frv/mb93090-mb00/pci-frv.c b/arch/frv/mb93090-mb00/pci-frv.c
index 0635bd6c2af3..34bb4b13e079 100644
--- a/arch/frv/mb93090-mb00/pci-frv.c
+++ b/arch/frv/mb93090-mb00/pci-frv.c
@@ -175,14 +175,6 @@ static void __init pcibios_assign_resources(void)
                         if (!r->start && r->end)
                                 pci_assign_resource(dev, idx);
                 }
-
-                if (pci_probe & PCI_ASSIGN_ROMS) {
-                        r = &dev->resource[PCI_ROM_RESOURCE];
-                        r->end -= r->start;
-                        r->start = 0;
-                        if (r->end)
-                                pci_assign_resource(dev, PCI_ROM_RESOURCE);
-                }
         }
 }
 
diff --git a/arch/frv/mb93090-mb00/pci-frv.h b/arch/frv/mb93090-mb00/pci-frv.h
index a7e487fe76ed..d51992ff5a61 100644
--- a/arch/frv/mb93090-mb00/pci-frv.h
+++ b/arch/frv/mb93090-mb00/pci-frv.h
@@ -14,14 +14,6 @@
 #define DBG(x...)
 #endif
 
-#define PCI_PROBE_BIOS          0x0001
-#define PCI_PROBE_CONF1         0x0002
-#define PCI_PROBE_CONF2         0x0004
-#define PCI_NO_CHECKS           0x0400
-#define PCI_ASSIGN_ROMS         0x1000
-#define PCI_BIOS_IRQ_SCAN       0x2000
-#define PCI_ASSIGN_ALL_BUSSES   0x4000
-
 extern unsigned int __nongpreldata pci_probe;
 
 /* pci-frv.c */
diff --git a/arch/frv/mb93090-mb00/pci-vdk.c b/arch/frv/mb93090-mb00/pci-vdk.c
index f211839e2cae..f9c86c475bbd 100644
--- a/arch/frv/mb93090-mb00/pci-vdk.c
+++ b/arch/frv/mb93090-mb00/pci-vdk.c
@@ -294,8 +294,6 @@ void pcibios_fixup_bus(struct pci_bus *bus)
         printk("### PCIBIOS_FIXUP_BUS(%d)\n",bus->number);
 #endif
 
-        pci_read_bridge_bases(bus);
-
         if (bus->number == 0) {
                 struct pci_dev *dev;
                 list_for_each_entry(dev, &bus->devices, bus_list) {
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 7cc3be9fa7c6..d89b6013c941 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -533,10 +533,9 @@ void pcibios_fixup_bus(struct pci_bus *b)
 {
         struct pci_dev *dev;
 
-        if (b->self) {
-                pci_read_bridge_bases(b);
+        if (b->self)
                 pcibios_fixup_bridge_resources(b->self);
-        }
+
         list_for_each_entry(dev, &b->devices, bus_list)
                 pcibios_fixup_device_resources(dev);
         platform_pci_fixup_bus(b);
diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c
index ae838ed5fcf2..6b8b75266801 100644
--- a/arch/microblaze/pci/pci-common.c
+++ b/arch/microblaze/pci/pci-common.c
@@ -863,14 +863,7 @@ void pcibios_setup_bus_devices(struct pci_bus *bus)
 
 void pcibios_fixup_bus(struct pci_bus *bus)
 {
-        /* When called from the generic PCI probe, read PCI<->PCI bridge
-         * bases. This is -not- called when generating the PCI tree from
-         * the OF device-tree.
-         */
-        if (bus->self != NULL)
-                pci_read_bridge_bases(bus);
-
-        /* Now fixup the bus bus */
+        /* Fixup the bus */
         pcibios_setup_bus_self(bus);
 
         /* Now fixup devices on that bus */
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index b8a0bf5766f2..c6996cf67a5c 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -311,12 +311,6 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
 
 void pcibios_fixup_bus(struct pci_bus *bus)
 {
-        struct pci_dev *dev = bus->self;
-
-        if (pci_has_flag(PCI_PROBE_ONLY) && dev &&
-            (dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {
-                pci_read_bridge_bases(bus);
-        }
 }
 
 EXPORT_SYMBOL(PCIBIOS_MIN_IO);
diff --git a/arch/mn10300/unit-asb2305/pci-asb2305.c b/arch/mn10300/unit-asb2305/pci-asb2305.c
index b5b036f64275..b7ab8378964c 100644
--- a/arch/mn10300/unit-asb2305/pci-asb2305.c
+++ b/arch/mn10300/unit-asb2305/pci-asb2305.c
@@ -183,18 +183,16 @@ static int __init pcibios_assign_resources(void)
         struct pci_dev *dev = NULL;
         struct resource *r;
 
-        if (!(pci_probe & PCI_ASSIGN_ROMS)) {
-                /* Try to use BIOS settings for ROMs, otherwise let
-                   pci_assign_unassigned_resources() allocate the new
-                   addresses. */
-                for_each_pci_dev(dev) {
-                        r = &dev->resource[PCI_ROM_RESOURCE];
-                        if (!r->flags || !r->start)
-                                continue;
-                        if (pci_claim_resource(dev, PCI_ROM_RESOURCE) < 0) {
-                                r->end -= r->start;
-                                r->start = 0;
-                        }
+        /* Try to use BIOS settings for ROMs, otherwise let
+           pci_assign_unassigned_resources() allocate the new
+           addresses. */
+        for_each_pci_dev(dev) {
+                r = &dev->resource[PCI_ROM_RESOURCE];
+                if (!r->flags || !r->start)
+                        continue;
+                if (pci_claim_resource(dev, PCI_ROM_RESOURCE) < 0) {
+                        r->end -= r->start;
+                        r->start = 0;
                 }
         }
 
diff --git a/arch/mn10300/unit-asb2305/pci-asb2305.h b/arch/mn10300/unit-asb2305/pci-asb2305.h
index 9e17aca5a2a1..96c484b12226 100644
--- a/arch/mn10300/unit-asb2305/pci-asb2305.h
+++ b/arch/mn10300/unit-asb2305/pci-asb2305.h
@@ -20,13 +20,6 @@
 #define DBG(x...)
 #endif
 
-#define PCI_PROBE_BIOS 1
-#define PCI_PROBE_CONF1 2
-#define PCI_PROBE_CONF2 4
-#define PCI_NO_CHECKS 0x400
-#define PCI_ASSIGN_ROMS 0x1000
-#define PCI_BIOS_IRQ_SCAN 0x2000
-
 extern unsigned int pci_probe;
 
 /* pci-asb2305.c */
diff --git a/arch/mn10300/unit-asb2305/pci.c b/arch/mn10300/unit-asb2305/pci.c
index 3dfe2d31c67b..deaa893efba5 100644
--- a/arch/mn10300/unit-asb2305/pci.c
+++ b/arch/mn10300/unit-asb2305/pci.c
@@ -324,7 +324,6 @@ void pcibios_fixup_bus(struct pci_bus *bus)
         struct pci_dev *dev;
 
         if (bus->self) {
-                pci_read_bridge_bases(bus);
                 pcibios_fixup_bridge_resources(bus->self);
         }
 
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index b9de34d44fcb..02c1d5dcee4d 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -1044,13 +1044,7 @@ void pcibios_set_master(struct pci_dev *dev)
 
 void pcibios_fixup_bus(struct pci_bus *bus)
 {
-        /* When called from the generic PCI probe, read PCI<->PCI bridge
-         * bases. This is -not- called when generating the PCI tree from
-         * the OF device-tree.
-         */
-        pci_read_bridge_bases(bus);
-
-        /* Now fixup the bus bus */
+        /* Fixup the bus */
         pcibios_setup_bus_self(bus);
 
         /* Now fixup devices on that bus */
diff --git a/arch/sh/drivers/pci/pci-sh4.h b/arch/sh/drivers/pci/pci-sh4.h
index cbf763b3015e..0288efc17ff3 100644
--- a/arch/sh/drivers/pci/pci-sh4.h
+++ b/arch/sh/drivers/pci/pci-sh4.h
@@ -11,14 +11,6 @@
 
 #include <asm/io.h>
 
-/* startup values */
-#define PCI_PROBE_BIOS          1
-#define PCI_PROBE_CONF1         2
-#define PCI_PROBE_CONF2         4
-#define PCI_NO_CHECKS           0x400
-#define PCI_ASSIGN_ROMS         0x1000
-#define PCI_BIOS_IRQ_SCAN       0x2000
-
 #define SH4_PCICR               0x100           /* PCI Control Register */
   #define SH4_PCICR_PREFIX        0xA5000000    /* CR prefix for write */
   #define SH4_PCICR_FTO           0x00000400    /* TRDY/IRDY Enable */
diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h
index 164e3f8d3c3d..fa1195dae425 100644
--- a/arch/x86/include/asm/pci_x86.h
+++ b/arch/x86/include/asm/pci_x86.h
@@ -93,8 +93,6 @@ extern raw_spinlock_t pci_config_lock;
 extern int (*pcibios_enable_irq)(struct pci_dev *dev);
 extern void (*pcibios_disable_irq)(struct pci_dev *dev);
 
-extern bool mp_should_keep_irq(struct device *dev);
-
 struct pci_raw_ops {
         int (*read)(unsigned int domain, unsigned int bus, unsigned int devfn,
                                                 int reg, int len, u32 *val);
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 8fd6f44aee83..09d3afc0a181 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -166,7 +166,6 @@ void pcibios_fixup_bus(struct pci_bus *b)
 {
         struct pci_dev *dev;
 
-        pci_read_bridge_bases(b);
         list_for_each_entry(dev, &b->devices, bus_list)
                 pcibios_fixup_device_resources(dev);
 }
@@ -673,24 +672,22 @@ int pcibios_add_device(struct pci_dev *dev)
         return 0;
 }
 
-int pcibios_enable_device(struct pci_dev *dev, int mask)
+int pcibios_alloc_irq(struct pci_dev *dev)
 {
-        int err;
-
-        if ((err = pci_enable_resources(dev, mask)) < 0)
-                return err;
-
-        if (!pci_dev_msi_enabled(dev))
-                return pcibios_enable_irq(dev);
-        return 0;
+        return pcibios_enable_irq(dev);
 }
 
-void pcibios_disable_device (struct pci_dev *dev)
+void pcibios_free_irq(struct pci_dev *dev)
 {
-        if (!pci_dev_msi_enabled(dev) && pcibios_disable_irq)
+        if (pcibios_disable_irq)
                 pcibios_disable_irq(dev);
 }
 
+int pcibios_enable_device(struct pci_dev *dev, int mask)
+{
+        return pci_enable_resources(dev, mask);
+}
+
 int pci_ext_cfg_avail(void)
 {
         if (raw_pci_ext_ops)
diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c
index 9a2b7101ae8a..e58565556703 100644
--- a/arch/x86/pci/fixup.c
+++ b/arch/x86/pci/fixup.c
@@ -62,19 +62,6 @@ static void pci_fixup_umc_ide(struct pci_dev *d)
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_UMC, PCI_DEVICE_ID_UMC_UM8886BF, pci_fixup_umc_ide);
 
-static void pci_fixup_ncr53c810(struct pci_dev *d)
-{
-        /*
-         * NCR 53C810 returns class code 0 (at least on some systems).
-         * Fix class to be PCI_CLASS_STORAGE_SCSI
-         */
-        if (!d->class) {
-                dev_warn(&d->dev, "Fixing NCR 53C810 class code\n");
-                d->class = PCI_CLASS_STORAGE_SCSI << 8;
-        }
-}
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, pci_fixup_ncr53c810);
-
 static void pci_fixup_latency(struct pci_dev *d)
 {
         /*
diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
index 27062303c881..22aaefb4f1ca 100644
--- a/arch/x86/pci/intel_mid_pci.c
+++ b/arch/x86/pci/intel_mid_pci.c
@@ -211,7 +211,7 @@ static int intel_mid_pci_irq_enable(struct pci_dev *dev)
         struct irq_alloc_info info;
         int polarity;
 
-        if (dev->irq_managed && dev->irq > 0)
+        if (pci_has_managed_irq(dev))
                 return 0;
 
         if (intel_mid_identify_cpu() == INTEL_MID_CPU_CHIP_TANGIER)
@@ -234,10 +234,13 @@ static int intel_mid_pci_irq_enable(struct pci_dev *dev)
 
 static void intel_mid_pci_irq_disable(struct pci_dev *dev)
 {
-        if (!mp_should_keep_irq(&dev->dev) && dev->irq_managed &&
-            dev->irq > 0) {
+        if (pci_has_managed_irq(dev)) {
                 mp_unmap_irq(dev->irq);
                 dev->irq_managed = 0;
+                /*
+                 * Don't reset dev->irq here, otherwise
+                 * intel_mid_pci_irq_enable() will fail on next call.
+                 */
         }
 }
 
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
index 9bd115484745..32e70343e6fd 100644
--- a/arch/x86/pci/irq.c
+++ b/arch/x86/pci/irq.c
@@ -1202,7 +1202,7 @@ static int pirq_enable_irq(struct pci_dev *dev)
                         struct pci_dev *temp_dev;
                         int irq;
 
-                        if (dev->irq_managed && dev->irq > 0)
+                        if (pci_has_managed_irq(dev))
                                 return 0;
 
                         irq = IO_APIC_get_PCI_irq_vector(dev->bus->number,
@@ -1230,8 +1230,7 @@ static int pirq_enable_irq(struct pci_dev *dev)
                         }
                         dev = temp_dev;
                         if (irq >= 0) {
-                                dev->irq_managed = 1;
-                                dev->irq = irq;
+                                pci_set_managed_irq(dev, irq);
                                 dev_info(&dev->dev, "PCI->APIC IRQ transform: "
                                          "INT %c -> IRQ %d\n", 'A' + pin - 1, irq);
                                 return 0;
@@ -1257,24 +1256,10 @@ static int pirq_enable_irq(struct pci_dev *dev)
         return 0;
 }
 
-bool mp_should_keep_irq(struct device *dev)
-{
-        if (dev->power.is_prepared)
-                return true;
-#ifdef CONFIG_PM
-        if (dev->power.runtime_status == RPM_SUSPENDING)
-                return true;
-#endif
-
-        return false;
-}
-
 static void pirq_disable_irq(struct pci_dev *dev)
 {
-        if (io_apic_assign_pci_irqs && !mp_should_keep_irq(&dev->dev) &&
-            dev->irq_managed && dev->irq) {
+        if (io_apic_assign_pci_irqs && pci_has_managed_irq(dev)) {
                 mp_unmap_irq(dev->irq);
-                dev->irq = 0;
-                dev->irq_managed = 0;
+                pci_reset_managed_irq(dev);
         }
 }
diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c
index b848cc3dc913..d27b4dcf221f 100644
--- a/arch/xtensa/kernel/pci.c
+++ b/arch/xtensa/kernel/pci.c
@@ -210,10 +210,6 @@ subsys_initcall(pcibios_init);
 
 void pcibios_fixup_bus(struct pci_bus *bus)
 {
-        if (bus->parent) {
-                /* This is a subordinate bridge */
-                pci_read_bridge_bases(bus);
-        }
 }
 
 void pcibios_set_master(struct pci_dev *dev)