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
This commit is contained in:
Bjorn Helgaas 2015-06-17 17:24:32 -05:00
commit 9f3d162071
1 changed files with 15 additions and 2 deletions

View File

@ -81,6 +81,17 @@ static const struct dmi_system_id pci_crs_quirks[] __initconst = {
DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies, LTD"), 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.. */ /* Now for the blacklist.. */
@ -121,8 +132,10 @@ void __init pci_acpi_crs_quirks(void)
{ {
int year; int year;
if (dmi_get_date(DMI_BIOS_DATE, &year, NULL, NULL) && year < 2008) if (dmi_get_date(DMI_BIOS_DATE, &year, NULL, NULL) && year < 2008) {
pci_use_crs = false; if (iomem_resource.end <= 0xffffffff)
pci_use_crs = false;
}
dmi_check_system(pci_crs_quirks); dmi_check_system(pci_crs_quirks);