Skip to content

Commit

Permalink
PCI: avoid early PCI mmconfig init if pci=noearly is given in cmdline
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jacob Pan authored and Jesse Barnes committed Jan 7, 2009
1 parent 0e331bf commit 23a3600
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion arch/x86/pci/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down

0 comments on commit 23a3600

Please sign in to comment.