Messages in this thread Patch in this message | | | Date | Wed, 16 Jan 2008 14:08:26 -0800 | From | Yinghai Lu <> | Subject | [PATCH 1/2] x86: clear pci_mmcfg_virt when mmcfg get rejected |
| |
[PATCH] x86: clear pci_mmcfg_virt when mmcfg get rejected
for x86_64, need to free pci_mmcfg_virt, and iounmap some pointers when MMCONF is not reserved in E820 or acpi _CRS and get rejected
Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Index: linux-2.6/arch/x86/pci/mmconfig-shared.c =================================================================== --- linux-2.6.orig/arch/x86/pci/mmconfig-shared.c +++ linux-2.6/arch/x86/pci/mmconfig-shared.c @@ -333,6 +333,7 @@ static void __init pci_mmcfg_reject_brok 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; Index: linux-2.6/arch/x86/pci/mmconfig_32.c =================================================================== --- linux-2.6.orig/arch/x86/pci/mmconfig_32.c +++ linux-2.6/arch/x86/pci/mmconfig_32.c @@ -146,3 +146,7 @@ int __init pci_mmcfg_arch_init(void) raw_pci_ops = &pci_mmcfg; return 1; } + +void __init pci_mmcfg_arch_free(void) +{ +} Index: linux-2.6/arch/x86/pci/mmconfig_64.c =================================================================== --- linux-2.6.orig/arch/x86/pci/mmconfig_64.c +++ linux-2.6/arch/x86/pci/mmconfig_64.c @@ -135,7 +135,7 @@ int __init pci_mmcfg_arch_reachable(unsi 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"); @@ -149,9 +149,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_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; +} Index: linux-2.6/arch/x86/pci/pci.h =================================================================== --- linux-2.6.orig/arch/x86/pci/pci.h +++ linux-2.6/arch/x86/pci/pci.h @@ -105,6 +105,7 @@ extern DECLARE_BITMAP(pci_mmcfg_fallback extern int __init pci_mmcfg_arch_reachable(unsigned int seg, unsigned int bus, unsigned int devfn); 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
| |