3 files changed, 19 insertions, 12 deletions

diff --git a/arch/x86/pci/direct.c b/arch/x86/pci/direct.c
index bd33620b007..e6fd8473fb7 100644
--- a/arch/x86/pci/direct.c
+++ b/arch/x86/pci/direct.c
@@ -280,12 +280,9 @@ void __init pci_direct_init(int type)
 
 int __init pci_direct_probe(void)
 {
-        struct resource *region, *region2;
-
         if ((pci_probe & PCI_PROBE_CONF1) == 0)
                 goto type2;
-        region = request_region(0xCF8, 8, "PCI conf1");
-        if (!region)
+        if (!request_region(0xCF8, 8, "PCI conf1"))
                 goto type2;
 
         if (pci_check_type1()) {
@@ -293,16 +290,14 @@ int __init pci_direct_probe(void)
                 port_cf9_safe = true;
                 return 1;
         }
-        release_resource(region);
+        release_region(0xCF8, 8);
 
  type2:
         if ((pci_probe & PCI_PROBE_CONF2) == 0)
                 return 0;
-        region = request_region(0xCF8, 4, "PCI conf2");
-        if (!region)
+        if (!request_region(0xCF8, 4, "PCI conf2"))
                 return 0;
-        region2 = request_region(0xC000, 0x1000, "PCI conf2");
-        if (!region2)
+        if (!request_region(0xC000, 0x1000, "PCI conf2"))
                 goto fail2;
 
         if (pci_check_type2()) {
@@ -311,8 +306,8 @@ int __init pci_direct_probe(void)
                 return 2;
         }
 
-        release_resource(region2);
+        release_region(0xC000, 0x1000);
  fail2:
-        release_resource(region);
+        release_region(0xCF8, 4);
         return 0;
 }
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
index 8201165bae2..372e9b8989b 100644
--- a/arch/x86/pci/irq.c
+++ b/arch/x86/pci/irq.c
@@ -602,7 +602,9 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route
         ||  (device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN && 
              device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX)
         ||  (device >= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MIN &&
-             device <= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX)) {
+             device <= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX)
+        ||  (device >= PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MIN &&
+             device <= PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MAX)) {
                 r->name = "PIIX/ICH";
                 r->get = pirq_piix_get;
                 r->set = pirq_piix_set;
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index e282886616a..750c346ef50 100644
--- a/arch/x86/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
@@ -606,6 +606,16 @@ static void __init __pci_mmcfg_init(int early)
         if (list_empty(&pci_mmcfg_list))
                 return;
 
+        if (pcibios_last_bus < 0) {
+                const struct pci_mmcfg_region *cfg;
+
+                list_for_each_entry(cfg, &pci_mmcfg_list, list) {
+                        if (cfg->segment)
+                                break;
+                        pcibios_last_bus = cfg->end_bus;
+                }
+        }
+
         if (pci_mmcfg_arch_init())
                 pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF;
         else {