From patchwork Wed Oct 2 10:49:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Gordeev X-Patchwork-Id: 279972 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 523C22C09F1 for ; Thu, 3 Oct 2013 03:29:19 +1000 (EST) Received: from dhcp-26-207.brq.redhat.com (unknown [89.24.186.221]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8FAA12C051A for ; Thu, 3 Oct 2013 03:27:49 +1000 (EST) Received: from dhcp-26-207.brq.redhat.com (localhost [127.0.0.1]) by dhcp-26-207.brq.redhat.com (8.14.5/8.14.5) with ESMTP id r92B0aPO002793; Wed, 2 Oct 2013 13:00:36 +0200 Received: (from agordeev@localhost) by dhcp-26-207.brq.redhat.com (8.14.5/8.14.5/Submit) id r92B0YUN002792; Wed, 2 Oct 2013 13:00:34 +0200 From: Alexander Gordeev To: linux-kernel@vger.kernel.org Subject: [PATCH RFC 75/77] vmxnet3: Update MSI/MSI-X interrupts enablement code Date: Wed, 2 Oct 2013 12:49:31 +0200 Message-Id: <6714315cab9b5eea79e6516caeb712362992bcc5.1380703263.git.agordeev@redhat.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: References: Cc: linux-mips@linux-mips.org, "VMware, Inc." , linux-nvme@lists.infradead.org, linux-ide@vger.kernel.org, linux-s390@vger.kernel.org, Andy King , linux-scsi@vger.kernel.org, linux-rdma@vger.kernel.org, x86@kernel.org, Alexander Gordeev , linux-pci@vger.kernel.org, iss_storagedev@hp.com, linux-driver@qlogic.com, Tejun Heo , Bjorn Helgaas , Dan Williams , Jon Mason , Ingo Molnar , Solarflare linux maintainers , netdev@vger.kernel.org, Ralf Baechle , e1000-devel@lists.sourceforge.net, Martin Schwidefsky , linux390@de.ibm.com, linuxppc-dev@lists.ozlabs.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.16rc2 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" As result of recent re-design of the MSI/MSI-X interrupts enabling pattern this driver has to be updated to use the new technique to obtain a optimal number of MSI/MSI-X interrupts required. Signed-off-by: Alexander Gordeev --- drivers/net/vmxnet3/vmxnet3_drv.c | 68 ++++++++++++++++++------------------- 1 files changed, 33 insertions(+), 35 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c index 00dc0d0..8d3321b 100644 --- a/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/drivers/net/vmxnet3/vmxnet3_drv.c @@ -2724,49 +2724,47 @@ vmxnet3_read_mac_addr(struct vmxnet3_adapter *adapter, u8 *mac) #ifdef CONFIG_PCI_MSI -/* - * Enable MSIx vectors. - * Returns : - * 0 on successful enabling of required vectors, - * VMXNET3_LINUX_MIN_MSIX_VECT when only minimum number of vectors required - * could be enabled. - * number of vectors which can be enabled otherwise (this number is smaller - * than VMXNET3_LINUX_MIN_MSIX_VECT) - */ - static int vmxnet3_acquire_msix_vectors(struct vmxnet3_adapter *adapter, int vectors) { - int err = -EINVAL, vector_threshold; + int err, vector_threshold; + vector_threshold = VMXNET3_LINUX_MIN_MSIX_VECT; + if (vectors < vector_threshold) + return -EINVAL; - while (vectors >= vector_threshold) { - err = pci_enable_msix(adapter->pdev, adapter->intr.msix_entries, - vectors); - if (!err) { - adapter->intr.num_intrs = vectors; - return 0; - } else if (err < 0) { - dev_err(&adapter->netdev->dev, - "Failed to enable MSI-X, error: %d\n", err); - return err; - } else if (err < vector_threshold) { - dev_info(&adapter->pdev->dev, - "Number of MSI-Xs which can be allocated " - "is lower than min threshold required.\n"); - return -ENOSPC; - } else { - /* If fails to enable required number of MSI-x vectors - * try enabling minimum number of vectors required. - */ - dev_err(&adapter->netdev->dev, - "Failed to enable %d MSI-X, trying %d instead\n", - vectors, vector_threshold); - vectors = vector_threshold; - } + err = pci_msix_table_size(adapter->pdev); + if (err < 0) + goto err_msix; + if (err < vector_threshold) { + dev_info(&adapter->pdev->dev, + "Number of MSI-X interrupts which can be allocated " + "is lower than min threshold required.\n"); + return -ENOSPC; + } + if (err < vectors) { + /* + * If fails to enable required number of MSI-x vectors + * try enabling minimum number of vectors required. + */ + dev_err(&adapter->netdev->dev, + "Failed to enable %d MSI-X, trying %d instead\n", + vectors, vector_threshold); + vectors = vector_threshold; } + err = pci_enable_msix(adapter->pdev, adapter->intr.msix_entries, + vectors); + if (err) + goto err_msix; + + adapter->intr.num_intrs = vectors; + return 0; + +err_msix: + dev_err(&adapter->netdev->dev, + "Failed to enable MSI-X, error: %d\n", err); return err; }