From: Jacob Pan Date: Mon, 8 Dec 2008 17:44:16 +0000 (-0800) Subject: PCI: avoid early PCI mmconfig init if pci=noearly is given in cmdline X-Git-Tag: v2.6.29-rc1~181^2~65 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=23a36002742bca87510201770a7d931c4aa63e97;p=linux-2.6-omap-h63xx.git PCI: avoid early PCI mmconfig init if pci=noearly is given in cmdline Early type 1 accesses can cause problems on some platforms, and pci=noearly is supposed to prevent them from occurring. However, early mcfg probing code uses type 1 and isn't protected by a check for noearly. This patch fixes that problem. Signed-off-by: Jacob Pan Signed-off-by: Jesse Barnes --- diff --git a/arch/x86/pci/init.c b/arch/x86/pci/init.c index bec3b048e72..25a1f8efed4 100644 --- a/arch/x86/pci/init.c +++ b/arch/x86/pci/init.c @@ -12,7 +12,8 @@ static __init int pci_arch_init(void) type = pci_direct_probe(); #endif - pci_mmcfg_early_init(); + if (!(pci_probe & PCI_PROBE_NOEARLY)) + pci_mmcfg_early_init(); #ifdef CONFIG_PCI_OLPC if (!pci_olpc_init())