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

Commit f343bb4c authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] x86{-64}: Remove old hack that disabled mmconfig support on AMD systems. 



Now that Greg implemented MCFG/_SEG support this shouldn't be needed
anymore

Cc: gregkh@suse.de

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b3426599

arch/i386/pci/mmconfig.c

+0 −7
Original line number Diff line number Diff line
@@ -127,13 +127,6 @@ static int __init pci_mmcfg_init(void) 
	    (pci_mmcfg_config[0].base_address == 0))

		goto out;



	/* Kludge for now. Don't use mmconfig on AMD systems because

	   those have some busses where mmconfig doesn't work,

	   and we don't parse ACPI MCFG well enough to handle that. 

	   Remove when proper handling is added. */

	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)

		goto out; 



	printk(KERN_INFO "PCI: Using MMCONFIG\n");

	raw_pci_ops = &pci_mmcfg;

	pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF;

arch/x86_64/pci/mmconfig.c

+0 −7
Original line number Diff line number Diff line
@@ -111,13 +111,6 @@ static int __init pci_mmcfg_init(void) 
	    (pci_mmcfg_config[0].base_address == 0))

		return 0;



	/* Kludge for now. Don't use mmconfig on AMD systems because

	   those have some busses where mmconfig doesn't work,

	   and we don't parse ACPI MCFG well enough to handle that. 

	   Remove when proper handling is added. */

	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)

		return 0; 



	/* RED-PEN i386 doesn't do _nocache right now */

	pci_mmcfg_virt = kmalloc(sizeof(*pci_mmcfg_virt) * pci_mmcfg_config_num, GFP_KERNEL);

	if (pci_mmcfg_virt == NULL) {