From e08a311b4d0d14af2ea67afaec02bfd382e20e92 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Fri, 13 Nov 2009 17:35:04 -0700
Subject: [PATCH] --- yaml --- r: 174819 b: refs/heads/master c:
 f6e1d8cc38b3776038fb15d3acc82ed8bb552f82 h: refs/heads/master i:   174817:
 bf6bb1c5876b13205dd2192d23da4a149a022d86   174815:
 b4c75814974b1ff7127469ed7e4a115645e2c8af v: v3

---
 [refs]                               |  2 +-
 trunk/arch/x86/include/asm/pci_x86.h |  1 +
 trunk/arch/x86/pci/mmconfig-shared.c | 12 ++++++++++++
 trunk/arch/x86/pci/mmconfig_32.c     | 11 +++--------
 trunk/arch/x86/pci/mmconfig_64.c     | 23 ++++-------------------
 5 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/[refs] b/[refs]
index 97b1118520d0..fa716e2046f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c57786ad3d921713c7ad8e44132aa537a1d0fec
+refs/heads/master: f6e1d8cc38b3776038fb15d3acc82ed8bb552f82
diff --git a/trunk/arch/x86/include/asm/pci_x86.h b/trunk/arch/x86/include/asm/pci_x86.h
index 0b7c316a70c3..b4bf9a942ed0 100644
--- a/trunk/arch/x86/include/asm/pci_x86.h
+++ b/trunk/arch/x86/include/asm/pci_x86.h
@@ -134,6 +134,7 @@ struct pci_mmcfg_region {
 
 extern int __init pci_mmcfg_arch_init(void);
 extern void __init pci_mmcfg_arch_free(void);
+extern struct pci_mmcfg_region *pci_mmconfig_lookup(int segment, int bus);
 
 extern struct list_head pci_mmcfg_list;
 
diff --git a/trunk/arch/x86/pci/mmconfig-shared.c b/trunk/arch/x86/pci/mmconfig-shared.c
index 71d69b88fa33..b19d1e54201e 100644
--- a/trunk/arch/x86/pci/mmconfig-shared.c
+++ b/trunk/arch/x86/pci/mmconfig-shared.c
@@ -97,6 +97,18 @@ static __init struct pci_mmcfg_region *pci_mmconfig_add(int segment, int start,
 	return new;
 }
 
+struct pci_mmcfg_region *pci_mmconfig_lookup(int segment, int bus)
+{
+	struct pci_mmcfg_region *cfg;
+
+	list_for_each_entry(cfg, &pci_mmcfg_list, list)
+		if (cfg->segment == segment &&
+		    cfg->start_bus <= bus && bus <= cfg->end_bus)
+			return cfg;
+
+	return NULL;
+}
+
 static const char __init *pci_mmcfg_e7520(void)
 {
 	u32 win;
diff --git a/trunk/arch/x86/pci/mmconfig_32.c b/trunk/arch/x86/pci/mmconfig_32.c
index c04523e09649..90d5fd476ed4 100644
--- a/trunk/arch/x86/pci/mmconfig_32.c
+++ b/trunk/arch/x86/pci/mmconfig_32.c
@@ -27,15 +27,10 @@ static int mmcfg_last_accessed_cpu;
  */
 static u32 get_base_addr(unsigned int seg, int bus, unsigned devfn)
 {
-	struct pci_mmcfg_region *cfg;
+	struct pci_mmcfg_region *cfg = pci_mmconfig_lookup(seg, bus);
 
-	list_for_each_entry(cfg, &pci_mmcfg_list, list)
-		if (cfg->segment == seg &&
-		    (cfg->start_bus <= bus) &&
-		    (cfg->end_bus >= bus))
-			return cfg->address;
-
-	/* Fall back to type 0 */
+	if (cfg)
+		return cfg->address;
 	return 0;
 }
 
diff --git a/trunk/arch/x86/pci/mmconfig_64.c b/trunk/arch/x86/pci/mmconfig_64.c
index cfa6cdb6d262..e783841bd1d7 100644
--- a/trunk/arch/x86/pci/mmconfig_64.c
+++ b/trunk/arch/x86/pci/mmconfig_64.c
@@ -14,28 +14,13 @@
 
 #define PREFIX "PCI: "
 
-static char __iomem *get_virt(unsigned int seg, unsigned bus)
-{
-	struct pci_mmcfg_region *cfg;
-
-	list_for_each_entry(cfg, &pci_mmcfg_list, list)
-		if (cfg->segment == seg &&
-		    (cfg->start_bus <= bus) &&
-		    (cfg->end_bus >= bus))
-			return cfg->virt;
-
-	/* Fall back to type 0 */
-	return NULL;
-}
-
 static char __iomem *pci_dev_base(unsigned int seg, unsigned int bus, unsigned int devfn)
 {
-	char __iomem *addr;
+	struct pci_mmcfg_region *cfg = pci_mmconfig_lookup(seg, bus);
 
-	addr = get_virt(seg, bus);
-	if (!addr)
-		return NULL;
-	return addr + (PCI_MMCFG_BUS_OFFSET(bus) | (devfn << 12));
+	if (cfg && cfg->virt)
+		return cfg->virt + (PCI_MMCFG_BUS_OFFSET(bus) | (devfn << 12));
+	return NULL;
 }
 
 static int pci_mmcfg_read(unsigned int seg, unsigned int bus,