From owner-svn-src-stable@FreeBSD.ORG  Thu Dec  2 15:58:54 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AA6EE1065670;
	Thu,  2 Dec 2010 15:58:54 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 695E88FC25;
	Thu,  2 Dec 2010 15:58:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oB2FwsZq014878;
	Thu, 2 Dec 2010 15:58:54 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oB2FwsIT014875;
	Thu, 2 Dec 2010 15:58:54 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201012021558.oB2FwsIT014875@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 2 Dec 2010 15:58:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216123 - in stable/8/sys: dev/pci i386/pci
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Dec 2010 15:58:54 -0000

Author: jhb
Date: Thu Dec  2 15:58:54 2010
New Revision: 216123
URL: http://svn.freebsd.org/changeset/base/216123

Log:
  MFC 215820:
  Add device IDs for two more ServerWorks Host-PCI bridges so that we can
  read their starting PCI bus number for older systems that do not support
  ACPI (or have a broken _BBN method).
  
  Approved by:	re (kib)

Modified:
  stable/8/sys/dev/pci/pci_pci.c
  stable/8/sys/i386/pci/pci_bus.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/pci/pci_pci.c
==============================================================================
--- stable/8/sys/dev/pci/pci_pci.c	Thu Dec  2 15:10:27 2010	(r216122)
+++ stable/8/sys/dev/pci/pci_pci.c	Thu Dec  2 15:58:54 2010	(r216123)
@@ -716,7 +716,9 @@ host_pcib_get_busno(pci_read_config_fn r
 	case 0x00171166:
 	case 0x01011166:
 	case 0x010f1014:
+	case 0x01101166:
 	case 0x02011166:
+	case 0x02251166:
 	case 0x03021014:
 		*busnum = read_config(bus, slot, func, 0x44, 1);
 		break;

Modified: stable/8/sys/i386/pci/pci_bus.c
==============================================================================
--- stable/8/sys/i386/pci/pci_bus.c	Thu Dec  2 15:10:27 2010	(r216122)
+++ stable/8/sys/i386/pci/pci_bus.c	Thu Dec  2 15:58:54 2010	(r216123)
@@ -204,6 +204,9 @@ legacy_pcib_is_host_bridge(int bus, int 
 			break;
 		}
 		break;
+	case 0x1A308086:
+		s = "Intel 82845 Host to PCI bridge";
+		break;
 
 		/* AMD -- vendor 0x1022 */
 	case 0x30001022:
@@ -304,6 +307,8 @@ legacy_pcib_is_host_bridge(int bus, int 
 	case 0x00171166:
 		/* FALLTHROUGH */
 	case 0x01011166:
+	case 0x01101166:
+	case 0x02251166:
 		s = "ServerWorks host to PCI bridge(unknown chipset)";
 		*busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1);
 		break;