aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-09-26 04:52:40 -0400
committerAndi Kleen <andi@basil.nowhere.org>2006-09-26 04:52:40 -0400
commit9abd79280bbb9f56049f0168f412c3538cadb6eb (patch)
treefb72faaf2fddf382c3ab57e716d182ab9dd1406e /arch/x86_64
parent5e544d618f0fb21011f36f28d5e3952b9dc109d2 (diff)
[PATCH] i386/x86-64: Only do MCFG e820 check when type 1 works
Needs earlier patch to split type 1 probing from use. This patch should fix the x86 macs where type 1 PCI config space access doesn't work, but MCFG does. They also don't have a usable e820 table so the e820 sanity check failed. Instead assume now that if type 1 doesn't work then MCFG must work and don't do the e820 check. Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/x86_64')
-rw-r--r--arch/x86_64/pci/mmconfig.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86_64/pci/mmconfig.c b/arch/x86_64/pci/mmconfig.c
index d6b90d08476b..8bea51030d66 100644
--- a/arch/x86_64/pci/mmconfig.c
+++ b/arch/x86_64/pci/mmconfig.c
@@ -176,7 +176,9 @@ void __init pci_mmcfg_init(int type)
176 (pci_mmcfg_config[0].base_address == 0)) 176 (pci_mmcfg_config[0].base_address == 0))
177 return; 177 return;
178 178
179 if (!e820_all_mapped(pci_mmcfg_config[0].base_address, 179 /* Only do this check when type 1 works. If it doesn't work
180 assume we run on a Mac and always use MCFG */
181 if (type == 1 && !e820_all_mapped(pci_mmcfg_config[0].base_address,
180 pci_mmcfg_config[0].base_address + MMCONFIG_APER_MIN, 182 pci_mmcfg_config[0].base_address + MMCONFIG_APER_MIN,
181 E820_RESERVED)) { 183 E820_RESERVED)) {
182 printk(KERN_ERR "PCI: BIOS Bug: MCFG area at %x is not E820-reserved\n", 184 printk(KERN_ERR "PCI: BIOS Bug: MCFG area at %x is not E820-reserved\n",