From f54960f3a9aab7f3a4fe097deaee3c9940748119 Mon Sep 17 00:00:00 2001 From: jkim Date: Mon, 13 Jul 2009 21:36:31 +0000 Subject: Match PCI Express root bridge _HID directly instead of relying on _CID. Reviewed by: jhb Approved by: re (kib) --- sys/amd64/pci/pci_bus.c | 1 + sys/dev/acpica/acpi_pcib_acpi.c | 2 +- sys/i386/pci/pci_bus.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'sys') diff --git a/sys/amd64/pci/pci_bus.c b/sys/amd64/pci/pci_bus.c index 3ab66d7..e943df1 100644 --- a/sys/amd64/pci/pci_bus.c +++ b/sys/amd64/pci/pci_bus.c @@ -386,6 +386,7 @@ DRIVER_MODULE(pcib, legacy, legacy_pcib_driver, hostb_devclass, 0, 0); */ static struct isa_pnp_id pcibus_pnp_ids[] = { { 0x030ad041 /* PNP0A03 */, "PCI Bus" }, + { 0x080ad041 /* PNP0A08 */, "PCIe Bus" }, { 0 } }; diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c index 7f5b8b7..4714125 100644 --- a/sys/dev/acpica/acpi_pcib_acpi.c +++ b/sys/dev/acpica/acpi_pcib_acpi.c @@ -131,7 +131,7 @@ MODULE_DEPEND(acpi_pcib, acpi, 1, 1, 1); static int acpi_pcib_acpi_probe(device_t dev) { - static char *pcib_ids[] = { "PNP0A03", NULL }; + static char *pcib_ids[] = { "PNP0A03", "PNP0A08", NULL }; if (acpi_disabled("pcib") || ACPI_ID_PROBE(device_get_parent(dev), dev, pcib_ids) == NULL) diff --git a/sys/i386/pci/pci_bus.c b/sys/i386/pci/pci_bus.c index 0a82bff..a6c11e8 100644 --- a/sys/i386/pci/pci_bus.c +++ b/sys/i386/pci/pci_bus.c @@ -598,6 +598,7 @@ DRIVER_MODULE(pcib, legacy, legacy_pcib_driver, hostb_devclass, 0, 0); */ static struct isa_pnp_id pcibus_pnp_ids[] = { { 0x030ad041 /* PNP0A03 */, "PCI Bus" }, + { 0x080ad041 /* PNP0A08 */, "PCIe Bus" }, { 0 } }; -- cgit v1.1