From owner-svn-src-head@FreeBSD.ORG  Thu Dec  3 08:11:20 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C712F106566B;
	Thu,  3 Dec 2009 08:11:20 +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 B6CDA8FC0C;
	Thu,  3 Dec 2009 08:11:20 +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 nB38BKwS046792;
	Thu, 3 Dec 2009 08:11:20 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nB38BK0h046790;
	Thu, 3 Dec 2009 08:11:20 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <200912030811.nB38BK0h046790@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Thu, 3 Dec 2009 08:11:20 +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: r200053 - head/sys/dev/ichsmb
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Dec 2009 08:11:20 -0000

Author: avg
Date: Thu Dec  3 08:11:20 2009
New Revision: 200053
URL: http://svn.freebsd.org/changeset/base/200053

Log:
  ichsmb: try attaching only to intel hardware in the default case
  
  Ideally we should attempt attaching only to known supported devices.
  But I am not sure that we have all supported PCI IDs already listed,
  and I am too young to die, err, I don't want to take the heat from
  causing a trouble to someone.
  
  MFC after:	1 week
  X-ToDo:		drop the default case

Modified:
  head/sys/dev/ichsmb/ichsmb_pci.c

Modified: head/sys/dev/ichsmb/ichsmb_pci.c
==============================================================================
--- head/sys/dev/ichsmb/ichsmb_pci.c	Thu Dec  3 08:01:29 2009	(r200052)
+++ head/sys/dev/ichsmb/ichsmb_pci.c	Thu Dec  3 08:11:20 2009	(r200053)
@@ -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
@@ -171,10 +172,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);