diff options
| author | Andi Kleen <ak@suse.de> | 2006-09-26 10:52:40 +0200 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-09-26 10:52:40 +0200 |
| commit | 5e544d618f0fb21011f36f28d5e3952b9dc109d2 (patch) | |
| tree | a91d6e5c640da473204bc48eb7b310fd3d82cd91 /arch/i386/pci/init.c | |
| parent | a15da49debaf7f09460a886b0ecd08588410715e (diff) | |
| download | blackbird-op-linux-5e544d618f0fb21011f36f28d5e3952b9dc109d2.tar.gz blackbird-op-linux-5e544d618f0fb21011f36f28d5e3952b9dc109d2.zip | |
[PATCH] i386/x86-64: PCI: split probing and initialization of type 1 config space access
First probe if type1/2 accesses work, but then only initialize them at the end.
This is useful for a later patch that needs this information inbetween.
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/i386/pci/init.c')
| -rw-r--r-- | arch/i386/pci/init.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/i386/pci/init.c b/arch/i386/pci/init.c index 51087a9d9172..d028e1b05c36 100644 --- a/arch/i386/pci/init.c +++ b/arch/i386/pci/init.c @@ -6,8 +6,13 @@ in the right sequence from here. */ static __init int pci_access_init(void) { + int type = 0; + +#ifdef CONFIG_PCI_DIRECT + type = pci_direct_probe(); +#endif #ifdef CONFIG_PCI_MMCONFIG - pci_mmcfg_init(); + pci_mmcfg_init(type); #endif if (raw_pci_ops) return 0; @@ -21,7 +26,7 @@ static __init int pci_access_init(void) * fails. */ #ifdef CONFIG_PCI_DIRECT - pci_direct_init(); + pci_direct_init(type); #endif return 0; } |
