From owner-p4-projects@FreeBSD.ORG  Fri Apr 20 23:33:52 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 6AAE516A406; Fri, 20 Apr 2007 23:33:52 +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 31F2A16A402
	for <perforce@freebsd.org>; Fri, 20 Apr 2007 23:33:52 +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 2193B13C44B
	for <perforce@freebsd.org>; Fri, 20 Apr 2007 23:33:52 +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 l3KNXpHX061696
	for <perforce@freebsd.org>; Fri, 20 Apr 2007 23:33:51 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3KNXp1S061688
	for perforce@freebsd.org; Fri, 20 Apr 2007 23:33:51 GMT
	(envelope-from mjacob@freebsd.org)
Date: Fri, 20 Apr 2007 23:33:51 GMT
Message-Id: <200704202333.l3KNXp1S061688@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 118502 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: Fri, 20 Apr 2007 23:33:52 -0000

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

Change 118502 by mjacob@mjexp on 2007/04/20 23:32:53

	While it's true we have motherboard blacklists for MSI
	breakage, it's true that this is incomplete. Save ourselves
	some grief by not trying to do MSI for Ultra320 chips.
	
	MFP4 after:	1 days

Affected files ...

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

Differences ...

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

@@ -522,11 +522,13 @@
 
 	/* Get a handle to the interrupt */
 	iqd = 0;
+
 	/*
 	 * First try to alloc an MSI-X message.  If that
 	 * fails, then try to alloc an MSI message instead.
+	 * Don't do this for U320 chips.
 	 */
-	if (pci_msix_count(dev) == 1) {
+	if (mpt->is_spi == 0 && pci_msix_count(dev) == 1) {
 		mpt->pci_msi_count = 1;
 		if (pci_alloc_msix(dev, &mpt->pci_msi_count) == 0) {
 			iqd = 1;
@@ -534,7 +536,7 @@
 			mpt->pci_msi_count = 0;
 		}
 	}
-	if (iqd == 0 && pci_msi_count(dev) == 1) {
+	if (mpt->is_spi == 0 && iqd == 0 && pci_msi_count(dev) == 1) {
 		mpt->pci_msi_count = 1;
 		if (pci_alloc_msi(dev, &mpt->pci_msi_count) == 0) {
 			iqd = 1;