From owner-svn-src-stable@FreeBSD.ORG  Sat Dec 19 11:10:33 2009
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 B897D106566B;
	Sat, 19 Dec 2009 11:10:33 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A6FFB8FC21;
	Sat, 19 Dec 2009 11:10:33 +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 nBJBAXQV031209;
	Sat, 19 Dec 2009 11:10:33 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBJBAXoQ031207;
	Sat, 19 Dec 2009 11:10:33 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <200912191110.nBJBAXoQ031207@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sat, 19 Dec 2009 11:10:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r200719 - stable/7/sys/dev/ichsmb
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: Sat, 19 Dec 2009 11:10:33 -0000

Author: avg
Date: Sat Dec 19 11:10:33 2009
New Revision: 200719
URL: http://svn.freebsd.org/changeset/base/200719

Log:
  MFC r200053: ichsmb: try attaching only to intel hardware in the default case

Modified:
  stable/7/sys/dev/ichsmb/ichsmb_pci.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/ichsmb/ichsmb_pci.c
==============================================================================
--- stable/7/sys/dev/ichsmb/ichsmb_pci.c	Sat Dec 19 11:05:42 2009	(r200718)
+++ stable/7/sys/dev/ichsmb/ichsmb_pci.c	Sat Dec 19 11:10:33 2009	(r200719)
@@ -67,6 +67,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/ichsmb/ichsmb_reg.h>
 
 /* PCI unique identifiers */
+#define VENDORID_INTEL			0x8086
 #define ID_82801AA			0x24138086
 #define ID_82801AB			0x24238086
 #define ID_82801BA			0x24438086
@@ -175,10 +176,11 @@ ichsmb_pci_probe(device_t dev)
 		device_set_desc(dev, "Intel 631xESB/6321ESB (ESB2) SMBus controller");
 		break;
 	default:
-		if (pci_get_class(dev) == PCIC_SERIALBUS
+		if (pci_get_vendor(dev) == VENDORID_INTEL
+		    && pci_get_class(dev) == PCIC_SERIALBUS
 		    && pci_get_subclass(dev) == PCIS_SERIALBUS_SMBUS
 		    && pci_get_progif(dev) == PCIS_SERIALBUS_SMBUS_PROGIF) {
-			device_set_desc(dev, "SMBus controller");
+			device_set_desc(dev, "Intel SMBus controller");
 			return (BUS_PROBE_DEFAULT); /* XXX */
 		}
 		return (ENXIO);