Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b64ad71 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

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: default avatarYinghai Lu <yinghai.lu@sun.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Greg KH <greg@kroah.com>
Cc: Greg KH <greg@kroah.com>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 7752d5cf

arch/x86/pci/mmconfig-shared.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

arch/x86/pci/mmconfig_32.c

+4 −0
Original line number Diff line number Diff line
@@ -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)

{

}

arch/x86/pci/mmconfig_64.c

+21 −1
Original line number Diff line number Diff line
@@ -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;

}

arch/x86/pci/pci.h

+1 −0
Original line number Diff line number Diff line
@@ -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