From owner-svn-src-all@FreeBSD.ORG  Mon Jul 13 21:36:31 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A05D41065679;
	Mon, 13 Jul 2009 21:36:31 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8FA628FC35;
	Mon, 13 Jul 2009 21:36:31 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6DLaVjd036386;
	Mon, 13 Jul 2009 21:36:31 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6DLaViP036382;
	Mon, 13 Jul 2009 21:36:31 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <200907132136.n6DLaViP036382@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Mon, 13 Jul 2009 21:36:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195666 - in head/sys: amd64/pci dev/acpica i386/pci
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Jul 2009 21:36:32 -0000

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 }
 };