diff options
| author | Jacob Pan <jacob.jun.pan@intel.com> | 2008-12-08 09:44:16 -0800 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-01-07 11:12:46 -0800 |
| commit | 23a36002742bca87510201770a7d931c4aa63e97 (patch) | |
| tree | 58e640ba1a8ae6b01c57efdc72642bcc15ecdda9 /arch/x86/pci/init.c | |
| parent | 0e331bf1c44401a5b6d7b778dd1f254724132dff (diff) | |
| download | op-kernel-dev-23a36002742bca87510201770a7d931c4aa63e97.zip op-kernel-dev-23a36002742bca87510201770a7d931c4aa63e97.tar.gz | |
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 <jacob.jun.pan@intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'arch/x86/pci/init.c')
| -rw-r--r-- | arch/x86/pci/init.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/pci/init.c b/arch/x86/pci/init.c index bec3b04..25a1f8e 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()) |
