From owner-svn-src-head@FreeBSD.ORG  Sat Mar 20 04:40:15 2010
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 843D21065670;
	Sat, 20 Mar 2010 04:40:15 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 725EB8FC18;
	Sat, 20 Mar 2010 04:40:15 +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 o2K4eF5v067762;
	Sat, 20 Mar 2010 04:40:15 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2K4eFD5067760;
	Sat, 20 Mar 2010 04:40:15 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201003200440.o2K4eFD5067760@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sat, 20 Mar 2010 04:40:15 +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: r205358 - head/sys/dev/siis
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: Sat, 20 Mar 2010 04:40:15 -0000

Author: mav
Date: Sat Mar 20 04:40:15 2010
New Revision: 205358
URL: http://svn.freebsd.org/changeset/base/205358

Log:
  Enable MSI by default for SiI3124.

Modified:
  head/sys/dev/siis/siis.c

Modified: head/sys/dev/siis/siis.c
==============================================================================
--- head/sys/dev/siis/siis.c	Sat Mar 20 04:22:22 2010	(r205357)
+++ head/sys/dev/siis/siis.c	Sat Mar 20 04:40:15 2010	(r205358)
@@ -94,14 +94,15 @@ static struct {
 	int		ports;
 	int		quirks;
 #define SIIS_Q_SNTF	1
+#define SIIS_Q_NOMSI	2
 } siis_ids[] = {
 	{0x31241095,	"SiI3124",	4,	0},
 	{0x31248086,	"SiI3124",	4,	0},
-	{0x31321095,	"SiI3132",	2,	SIIS_Q_SNTF},
-	{0x02421095,	"SiI3132",	2,	SIIS_Q_SNTF},
-	{0x02441095,	"SiI3132",	2,	SIIS_Q_SNTF},
-	{0x31311095,	"SiI3131",	1,	SIIS_Q_SNTF},
-	{0x35311095,	"SiI3531",	1,	SIIS_Q_SNTF},
+	{0x31321095,	"SiI3132",	2,	SIIS_Q_SNTF|SIIS_Q_NOMSI},
+	{0x02421095,	"SiI3132",	2,	SIIS_Q_SNTF|SIIS_Q_NOMSI},
+	{0x02441095,	"SiI3132",	2,	SIIS_Q_SNTF|SIIS_Q_NOMSI},
+	{0x31311095,	"SiI3131",	1,	SIIS_Q_SNTF|SIIS_Q_NOMSI},
+	{0x35311095,	"SiI3531",	1,	SIIS_Q_SNTF|SIIS_Q_NOMSI},
 	{0,		NULL,		0,	0}
 };
 
@@ -249,7 +250,7 @@ static int
 siis_setup_interrupt(device_t dev)
 {
 	struct siis_controller *ctlr = device_get_softc(dev);
-	int msi = 0;
+	int msi = ctlr->quirks & SIIS_Q_NOMSI ? 0 : 1;
 
 	/* Process hints. */
 	resource_int_value(device_get_name(dev),