From c7485ee5c3e39cb5823b1423937939364cf9020b Mon Sep 17 00:00:00 2001
From: Yinghai Lu <Yinghai.Lu@Sun.COM>
Date: Fri, 15 Feb 2008 01:28:41 -0800
Subject: [PATCH] --- yaml --- r: 94807 b: refs/heads/master c:
 0b64ad7123eb013c3de26750f2d4c356cd566231 h: refs/heads/master i:   94805:
 01223a80fad86ca09e8702cccad59651f65a3876   94803:
 f9cfbaddf5e50f6f90865ec81221774c114ea4e3   94799:
 5863069d4cde3f618daa209ee331e9fdf820769a v: v3

---
 [refs]                               |  2 +-
 trunk/arch/x86/pci/mmconfig-shared.c |  1 +
 trunk/arch/x86/pci/mmconfig_32.c     |  4 ++++
 trunk/arch/x86/pci/mmconfig_64.c     | 22 +++++++++++++++++++++-
 trunk/arch/x86/pci/pci.h             |  1 +
 5 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a39f4409de46..3aeea5653418 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7752d5cfe3d11ca0bb9c673ec38bd78ba6578f8e
+refs/heads/master: 0b64ad7123eb013c3de26750f2d4c356cd566231
diff --git a/trunk/arch/x86/pci/mmconfig-shared.c b/trunk/arch/x86/pci/mmconfig-shared.c
index 498e35ee428e..8f204955427c 100644
--- a/trunk/arch/x86/pci/mmconfig-shared.c
+++ b/trunk/arch/x86/pci/mmconfig-shared.c
@@ -300,6 +300,7 @@ static void __init pci_mmcfg_reject_broken(void)
 
 reject:
 	printk(KERN_ERR "PCI: Not using MMCONFIG.\n");
+	pci_mmcfg_arch_free();
 	kfree(pci_mmcfg_config);
 	pci_mmcfg_config = NULL;
 	pci_mmcfg_config_num = 0;
diff --git a/trunk/arch/x86/pci/mmconfig_32.c b/trunk/arch/x86/pci/mmconfig_32.c
index 081816ada057..f3c761dce695 100644
--- a/trunk/arch/x86/pci/mmconfig_32.c
+++ b/trunk/arch/x86/pci/mmconfig_32.c
@@ -136,3 +136,7 @@ int __init pci_mmcfg_arch_init(void)
 	raw_pci_ext_ops = &pci_mmcfg;
 	return 1;
 }
+
+void __init pci_mmcfg_arch_free(void)
+{
+}
diff --git a/trunk/arch/x86/pci/mmconfig_64.c b/trunk/arch/x86/pci/mmconfig_64.c
index 9207fd49233c..a1994163c99d 100644
--- a/trunk/arch/x86/pci/mmconfig_64.c
+++ b/trunk/arch/x86/pci/mmconfig_64.c
@@ -127,7 +127,7 @@ static void __iomem * __init mcfg_ioremap(struct acpi_mcfg_allocation *cfg)
 int __init pci_mmcfg_arch_init(void)
 {
 	int i;
-	pci_mmcfg_virt = kmalloc(sizeof(*pci_mmcfg_virt) *
+	pci_mmcfg_virt = kzalloc(sizeof(*pci_mmcfg_virt) *
 				 pci_mmcfg_config_num, GFP_KERNEL);
 	if (pci_mmcfg_virt == NULL) {
 		printk(KERN_ERR "PCI: Can not allocate memory for mmconfig structures\n");
@@ -141,9 +141,29 @@ int __init pci_mmcfg_arch_init(void)
 			printk(KERN_ERR "PCI: Cannot map mmconfig aperture for "
 					"segment %d\n",
 				pci_mmcfg_config[i].pci_segment);
+			pci_mmcfg_arch_free();
 			return 0;
 		}
 	}
 	raw_pci_ext_ops = &pci_mmcfg;
 	return 1;
 }
+
+void __init pci_mmcfg_arch_free(void)
+{
+	int i;
+
+	if (pci_mmcfg_virt == NULL)
+		return;
+
+	for (i = 0; i < pci_mmcfg_config_num; ++i) {
+		if (pci_mmcfg_virt[i].virt) {
+			iounmap(pci_mmcfg_virt[i].virt);
+			pci_mmcfg_virt[i].virt = NULL;
+			pci_mmcfg_virt[i].cfg = NULL;
+		}
+	}
+
+	kfree(pci_mmcfg_virt);
+	pci_mmcfg_virt = NULL;
+}
diff --git a/trunk/arch/x86/pci/pci.h b/trunk/arch/x86/pci/pci.h
index 28b9b72ce7c7..c8b89a832c66 100644
--- a/trunk/arch/x86/pci/pci.h
+++ b/trunk/arch/x86/pci/pci.h
@@ -101,6 +101,7 @@ extern void pci_pcbios_init(void);
 /* pci-mmconfig.c */
 
 extern int __init pci_mmcfg_arch_init(void);
+extern void __init pci_mmcfg_arch_free(void);
 
 /*
  * AMD Fam10h CPUs are buggy, and cannot access MMIO config space