From owner-svn-src-stable-8@FreeBSD.ORG Tue Jun 7 21:15:44 2011 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0D7391065674; Tue, 7 Jun 2011 21:15:44 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F15668FC1A; Tue, 7 Jun 2011 21:15:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p57LFhcu000880; Tue, 7 Jun 2011 21:15:43 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p57LFhmD000878; Tue, 7 Jun 2011 21:15:43 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201106072115.p57LFhmD000878@svn.freebsd.org> From: John Baldwin Date: Tue, 7 Jun 2011 21:15:43 +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: r222837 - stable/8/sys/dev/pci X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Jun 2011 21:15:44 -0000 Author: jhb Date: Tue Jun 7 21:15:43 2011 New Revision: 222837 URL: http://svn.freebsd.org/changeset/base/222837 Log: MFC 221138: Only align MSI message groups based on the number of messages being allocated, not the maximum number of messages the device supports. The spec only requires the former, and I believe I implemented the latter due to misunderstanding an e-mail. In particular, this fixes an issue where having several devices that all support 16 messages can run out of IDT vectors on x86 even though the driver only uses a single message. Modified: stable/8/sys/dev/pci/pci.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) Modified: stable/8/sys/dev/pci/pci.c ============================================================================== --- stable/8/sys/dev/pci/pci.c Tue Jun 7 20:49:29 2011 (r222836) +++ stable/8/sys/dev/pci/pci.c Tue Jun 7 21:15:43 2011 (r222837) @@ -1910,7 +1910,7 @@ pci_alloc_msi_method(device_t dev, devic for (;;) { /* Try to allocate N messages. */ error = PCIB_ALLOC_MSI(device_get_parent(dev), child, actual, - cfg->msi.msi_msgnum, irqs); + actual, irqs); if (error == 0) break; if (actual == 1)