diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2015-06-17 17:24:32 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2015-06-17 17:24:32 -0500 |
| commit | 9f3d16207146c56902b3de79a2c3537d81782d8d (patch) | |
| tree | a47a96c20a6dee4085876da8ee0791f10c715e10 | |
| parent | bf933dbb84453c502355743828a37ead5e82aa68 (diff) | |
| parent | 3d9fecf6bfb8b12bc2f9a4c7109895a2a2bb9436 (diff) | |
Merge branch 'pci/resource' into next
* pci/resource:
x86/PCI: Use host bridge _CRS info on systems with >32 bit addressing
x86/PCI: Use host bridge _CRS info on Foxconn K8M890-8237A
| -rw-r--r-- | arch/x86/pci/acpi.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index e4695985f9de..2ae7ce240e02 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c @@ -81,6 +81,17 @@ static const struct dmi_system_id pci_crs_quirks[] __initconst = { DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies, LTD"), }, }, + /* https://bugs.launchpad.net/ubuntu/+source/alsa-driver/+bug/931368 */ + /* https://bugs.launchpad.net/ubuntu/+source/alsa-driver/+bug/1033299 */ + { + .callback = set_use_crs, + .ident = "Foxconn K8M890-8237A", + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "Foxconn"), + DMI_MATCH(DMI_BOARD_NAME, "K8M890-8237A"), + DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies, LTD"), + }, + }, /* Now for the blacklist.. */ @@ -121,8 +132,10 @@ void __init pci_acpi_crs_quirks(void) { int year; - if (dmi_get_date(DMI_BIOS_DATE, &year, NULL, NULL) && year < 2008) - pci_use_crs = false; + if (dmi_get_date(DMI_BIOS_DATE, &year, NULL, NULL) && year < 2008) { + if (iomem_resource.end <= 0xffffffff) + pci_use_crs = false; + } dmi_check_system(pci_crs_quirks); |