From owner-p4-projects@FreeBSD.ORG  Sun Apr  8 00:58:55 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F259E16A403; Sun,  8 Apr 2007 00:58:54 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C0B4116A402
	for <perforce@freebsd.org>; Sun,  8 Apr 2007 00:58:54 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id B1C3113C46E
	for <perforce@freebsd.org>; Sun,  8 Apr 2007 00:58:54 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l380wscD086145
	for <perforce@freebsd.org>; Sun, 8 Apr 2007 00:58:54 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l380wsUB086142
	for perforce@freebsd.org; Sun, 8 Apr 2007 00:58:54 GMT
	(envelope-from mjacob@freebsd.org)
Date: Sun, 8 Apr 2007 00:58:54 GMT
Message-Id: <200704080058.l380wsUB086142@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mjacob@freebsd.org using -f
From: Matt Jacob <mjacob@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 117614 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Apr 2007 00:58:55 -0000

http://perforce.freebsd.org/chv.cgi?CH=117614

Change 117614 by mjacob@mjexp on 2007/04/08 00:57:52

	Remove the msi_enable hint- now that all and sundry have
	started filtering out motherboards with broken MSI implementations
	it's time to let the default actions of trying to acquire MSI
	type interrupts works as designed.
	MFP4 after:	1 day

Affected files ...

.. //depot/projects/mjexp/sys/dev/mpt/mpt.h#9 edit
.. //depot/projects/mjexp/sys/dev/mpt/mpt_pci.c#8 edit

Differences ...

==== //depot/projects/mjexp/sys/dev/mpt/mpt.h#9 (text+ko) ====

@@ -527,7 +527,7 @@
 		unit		: 8,
 		ready		: 1,
 		fw_uploaded	: 1,
-		msi_enable	: 1,
+				: 1,
 		twildcard	: 1,
 		tenabled	: 1,
 		do_cfg_role	: 1,

==== //depot/projects/mjexp/sys/dev/mpt/mpt_pci.c#8 (text+ko) ====

@@ -334,7 +334,6 @@
 		}
 		mpt->do_cfg_role = 1;
 	}
-	mpt->msi_enable = 0;
 }
 #else
 static void
@@ -361,11 +360,6 @@
 	}
 
 	tval = 0;
-	mpt->msi_enable = 0;
-	if (resource_int_value(device_get_name(mpt->dev),
-	    device_get_unit(mpt->dev), "msi_enable", &tval) == 0 && tval == 1) {
-		mpt->msi_enable = 1;
-	}
 }
 #endif
 
@@ -528,26 +522,24 @@
 
 	/* Get a handle to the interrupt */
 	iqd = 0;
-	if (mpt->msi_enable) {
-		/*
-		 * First try to alloc an MSI-X message.  If that
-		 * fails, then try to alloc an MSI message instead.
-		 */
-		if (pci_msix_count(dev) == 1) {
-			mpt->pci_msi_count = 1;
-			if (pci_alloc_msix(dev, &mpt->pci_msi_count) == 0) {
-				iqd = 1;
-			} else {
-				mpt->pci_msi_count = 0;
-			}
+	/*
+	 * First try to alloc an MSI-X message.  If that
+	 * fails, then try to alloc an MSI message instead.
+	 */
+	if (pci_msix_count(dev) == 1) {
+		mpt->pci_msi_count = 1;
+		if (pci_alloc_msix(dev, &mpt->pci_msi_count) == 0) {
+			iqd = 1;
+		} else {
+			mpt->pci_msi_count = 0;
 		}
-		if (iqd == 0 && pci_msi_count(dev) == 1) {
-			mpt->pci_msi_count = 1;
-			if (pci_alloc_msi(dev, &mpt->pci_msi_count) == 0) {
-				iqd = 1;
-			} else {
-				mpt->pci_msi_count = 0;
-			}
+	}
+	if (iqd == 0 && pci_msi_count(dev) == 1) {
+		mpt->pci_msi_count = 1;
+		if (pci_alloc_msi(dev, &mpt->pci_msi_count) == 0) {
+			iqd = 1;
+		} else {
+			mpt->pci_msi_count = 0;
 		}
 	}
 	mpt->pci_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &iqd,