diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-19 11:15:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-19 11:15:22 -0400 |
| commit | 79e453d49bd49ba1b576f89310cc565c9e4ca379 (patch) | |
| tree | 690353097ed789d691c072edd3a7259e3477d511 /arch/i386/pci/mmconfig.c | |
| parent | ab5cfd2aa3af40b35d7a948de8e279dc82c5b9f6 (diff) | |
Revert mmiocfg heuristics and blacklist changes
This reverts commits 11012d419cfc0e0f78ca356aca03674217910124 and
40dd2d20f220eda1cd0da8ea3f0f9db8971ba237, which allowed us to use the
MMIO accesses for PCI config cycles even without the area being marked
reserved in the e820 memory tables.
Those changes were needed for EFI-environment Intel macs, but broke some
newer Intel 965 boards, so for now it's better to revert to our old
2.6.17 behaviour and at least avoid introducing any new breakage.
Andi Kleen has a set of patches that work with both EFI and the broken
Intel 965 boards, which will be applied once they get wider testing.
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Edgar Hucek <hostmaster@ed-soft.at>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386/pci/mmconfig.c')
| -rw-r--r-- | arch/i386/pci/mmconfig.c | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/arch/i386/pci/mmconfig.c b/arch/i386/pci/mmconfig.c index ef5a2faa7d82..972180f738d9 100644 --- a/arch/i386/pci/mmconfig.c +++ b/arch/i386/pci/mmconfig.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <linux/pci.h> | 12 | #include <linux/pci.h> |
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/acpi.h> | 14 | #include <linux/acpi.h> |
| 15 | #include <linux/dmi.h> | ||
| 16 | #include <asm/e820.h> | 15 | #include <asm/e820.h> |
| 17 | #include "pci.h" | 16 | #include "pci.h" |
| 18 | 17 | ||
| @@ -188,31 +187,9 @@ static __init void unreachable_devices(void) | |||
| 188 | } | 187 | } |
| 189 | } | 188 | } |
| 190 | 189 | ||
| 191 | static int disable_mcfg(struct dmi_system_id *d) | ||
| 192 | { | ||
| 193 | printk("PCI: %s detected. Disabling MCFG.\n", d->ident); | ||
| 194 | pci_probe &= ~PCI_PROBE_MMCONF; | ||
| 195 | return 0; | ||
| 196 | } | ||
| 197 | |||
| 198 | static struct dmi_system_id __initdata dmi_bad_mcfg[] = { | ||
| 199 | /* Has broken MCFG table that makes the system hang when used */ | ||
| 200 | { | ||
| 201 | .callback = disable_mcfg, | ||
| 202 | .ident = "Intel D3C5105 SDV", | ||
| 203 | .matches = { | ||
| 204 | DMI_MATCH(DMI_BIOS_VENDOR, "Intel"), | ||
| 205 | DMI_MATCH(DMI_BOARD_NAME, "D26928"), | ||
| 206 | }, | ||
| 207 | }, | ||
| 208 | {} | ||
| 209 | }; | ||
| 210 | |||
| 211 | void __init pci_mmcfg_init(void) | 190 | void __init pci_mmcfg_init(void) |
| 212 | { | 191 | { |
| 213 | dmi_check_system(dmi_bad_mcfg); | 192 | if ((pci_probe & PCI_PROBE_MMCONF) == 0) |
| 214 | |||
| 215 | if ((pci_probe & (PCI_PROBE_MMCONF_FORCE|PCI_PROBE_MMCONF)) == 0) | ||
| 216 | return; | 193 | return; |
| 217 | 194 | ||
| 218 | acpi_table_parse(ACPI_MCFG, acpi_parse_mcfg); | 195 | acpi_table_parse(ACPI_MCFG, acpi_parse_mcfg); |
| @@ -221,6 +198,15 @@ void __init pci_mmcfg_init(void) | |||
| 221 | (pci_mmcfg_config[0].base_address == 0)) | 198 | (pci_mmcfg_config[0].base_address == 0)) |
| 222 | return; | 199 | return; |
| 223 | 200 | ||
| 201 | if (!e820_all_mapped(pci_mmcfg_config[0].base_address, | ||
| 202 | pci_mmcfg_config[0].base_address + MMCONFIG_APER_MIN, | ||
| 203 | E820_RESERVED)) { | ||
| 204 | printk(KERN_ERR "PCI: BIOS Bug: MCFG area at %x is not E820-reserved\n", | ||
| 205 | pci_mmcfg_config[0].base_address); | ||
| 206 | printk(KERN_ERR "PCI: Not using MMCONFIG.\n"); | ||
| 207 | return; | ||
| 208 | } | ||
| 209 | |||
| 224 | printk(KERN_INFO "PCI: Using MMCONFIG\n"); | 210 | printk(KERN_INFO "PCI: Using MMCONFIG\n"); |
| 225 | raw_pci_ops = &pci_mmcfg; | 211 | raw_pci_ops = &pci_mmcfg; |
| 226 | pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF; | 212 | pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF; |