From owner-p4-projects@FreeBSD.ORG  Tue Jun 23 07:01:44 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BB2E21065670; Tue, 23 Jun 2009 07:01:43 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7ACA8106564A
	for <perforce@freebsd.org>; Tue, 23 Jun 2009 07:01:43 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 695068FC16
	for <perforce@freebsd.org>; Tue, 23 Jun 2009 07:01:43 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5N71hb3049945
	for <perforce@freebsd.org>; Tue, 23 Jun 2009 07:01:43 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5N71hRl049943
	for perforce@freebsd.org; Tue, 23 Jun 2009 07:01:43 GMT
	(envelope-from mav@freebsd.org)
Date: Tue, 23 Jun 2009 07:01:43 GMT
Message-Id: <200906230701.n5N71hRl049943@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 164939 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: Tue, 23 Jun 2009 07:01:44 -0000

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

Change 164939 by mav@mav_mavbook on 2009/06/23 07:01:13

	Enable single vector MSI by default.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#35 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#35 (text+ko) ====

@@ -297,16 +297,17 @@
 ahci_setup_interrupt(device_t dev)
 {
 	struct ahci_controller *ctlr = device_get_softc(dev);
-	int i, msi = 0;
+	int i, msi = 1;
 
 	/* Process hints. */
-	if (resource_int_value(device_get_name(dev),
-	    device_get_unit(dev), "msi", &i) == 0) {
-		if (i == 1)
-			msi = min(1, pci_msi_count(dev));
-		else if (i > 1)
-			msi = pci_msi_count(dev);
-	}
+	resource_int_value(device_get_name(dev),
+	    device_get_unit(dev), "msi", &msi);
+	if (msi < 0)
+		msi = 0;
+	else if (msi == 1)
+		msi = min(1, pci_msi_count(dev));
+	else if (msi > 1)
+		msi = pci_msi_count(dev);
 	/* Allocate MSI if needed/present. */
 	if (msi && pci_alloc_msi(dev, &msi) == 0) {
 		ctlr->numirqs = msi;