From owner-svn-src-stable@FreeBSD.ORG  Sun May  2 12:44:11 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id A0CBB1065740;
	Sun,  2 May 2010 12:44:11 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 908718FC17;
	Sun,  2 May 2010 12:44:11 +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 o42CiBit061342;
	Sun, 2 May 2010 12:44:11 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o42CiBtm061340;
	Sun, 2 May 2010 12:44:11 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201005021244.o42CiBtm061340@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sun, 2 May 2010 12:44:11 +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: r207505 - stable/8/sys/dev/siis
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: Sun, 02 May 2010 12:44:11 -0000

Author: mav
Date: Sun May  2 12:44:11 2010
New Revision: 207505
URL: http://svn.freebsd.org/changeset/base/207505

Log:
  MFC r205358:
  Enable MSI by default for SiI3124.

Modified:
  stable/8/sys/dev/siis/siis.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)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/geom/sched/   (props changed)

Modified: stable/8/sys/dev/siis/siis.c
==============================================================================
--- stable/8/sys/dev/siis/siis.c	Sun May  2 12:43:18 2010	(r207504)
+++ stable/8/sys/dev/siis/siis.c	Sun May  2 12:44:11 2010	(r207505)
@@ -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),