svn commit: r195666 - in head/sys: amd64/pci dev/acpica i386/pci

[Jung-uk Kim]

Author: jkim
Date: Mon Jul 13 21:36:31 2009
New Revision: 195666
URL: http://svn.freebsd.org/changeset/base/195666

Log:
  Match PCI Express root bridge _HID directly instead of
  relying on _CID.
  
  Reviewed by:	jhb
  Approved by:	re (kib)

Modified:
  head/sys/amd64/pci/pci_bus.c
  head/sys/dev/acpica/acpi_pcib_acpi.c
  head/sys/i386/pci/pci_bus.c

Modified: head/sys/amd64/pci/pci_bus.c
==============================================================================
--- head/sys/amd64/pci/pci_bus.c	Mon Jul 13 21:21:30 2009	(r195665)
+++ head/sys/amd64/pci/pci_bus.c	Mon Jul 13 21:36:31 2009	(r195666)
@@ -386,6 +386,7 @@ DRIVER_MODULE(pcib, legacy, legacy_pcib_
  */
 static struct isa_pnp_id pcibus_pnp_ids[] = {
 	{ 0x030ad041 /* PNP0A03 */, "PCI Bus" },
+	{ 0x080ad041 /* PNP0A08 */, "PCIe Bus" },
 	{ 0 }
 };
 

Modified: head/sys/dev/acpica/acpi_pcib_acpi.c
==============================================================================
--- head/sys/dev/acpica/acpi_pcib_acpi.c	Mon Jul 13 21:21:30 2009	(r195665)
+++ head/sys/dev/acpica/acpi_pcib_acpi.c	Mon Jul 13 21:36:31 2009	(r195666)
@@ -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)

Modified: head/sys/i386/pci/pci_bus.c
==============================================================================
--- head/sys/i386/pci/pci_bus.c	Mon Jul 13 21:21:30 2009	(r195665)
+++ head/sys/i386/pci/pci_bus.c	Mon Jul 13 21:36:31 2009	(r195666)
@@ -598,6 +598,7 @@ DRIVER_MODULE(pcib, legacy, legacy_pcib_
  */
 static struct isa_pnp_id pcibus_pnp_ids[] = {
 	{ 0x030ad041 /* PNP0A03 */, "PCI Bus" },
+	{ 0x080ad041 /* PNP0A08 */, "PCIe Bus" },
 	{ 0 }
 };