Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754530Ab3JBQzo (ORCPT ); Wed, 2 Oct 2013 12:55:44 -0400 Received: from 221-186-24-89.in-addr.arpa ([89.24.186.221]:25075 "EHLO dhcp-26-207.brq.redhat.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1753523Ab3JBQzl (ORCPT ); Wed, 2 Oct 2013 12:55:41 -0400 From: Alexander Gordeev To: linux-kernel@vger.kernel.org Cc: Alexander Gordeev , Bjorn Helgaas , Ralf Baechle , Michael Ellerman , Benjamin Herrenschmidt , Martin Schwidefsky , Ingo Molnar , Tejun Heo , Dan Williams , Andy King , Jon Mason , Matt Porter , linux-pci@vger.kernel.org, linux-mips@linux-mips.org, linuxppc-dev@lists.ozlabs.org, linux390@de.ibm.com, linux-s390@vger.kernel.org, x86@kernel.org, linux-ide@vger.kernel.org, iss_storagedev@hp.com, linux-nvme@lists.infradead.org, linux-rdma@vger.kernel.org, netdev@vger.kernel.org, e1000-devel@lists.sourceforge.net, linux-driver@qlogic.com, Solarflare linux maintainers , "VMware, Inc." , linux-scsi@vger.kernel.org Subject: [PATCH RFC 50/77] mlx5: Update MSI/MSI-X interrupts enablement code Date: Wed, 2 Oct 2013 12:49:06 +0200 Message-Id: <9650a7dfbcfd5f1da21f7b093665abf4b1041071.1380703263.git.agordeev@redhat.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1929 Lines: 60 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/ethernet/mellanox/mlx5/core/main.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c index adf0e5d..5c21e50 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c @@ -119,8 +119,13 @@ static int mlx5_enable_msix(struct mlx5_core_dev *dev) int err; int i; + err = pci_msix_table_size(dev->pdev); + if (err < 0) + return err; + nvec = dev->caps.num_ports * num_online_cpus() + MLX5_EQ_VEC_COMP_BASE; nvec = min_t(int, nvec, num_eqs); + nvec = min_t(int, nvec, err); if (nvec <= MLX5_EQ_VEC_COMP_BASE) return -ENOSPC; @@ -131,20 +136,15 @@ static int mlx5_enable_msix(struct mlx5_core_dev *dev) for (i = 0; i < nvec; i++) table->msix_arr[i].entry = i; -retry: - table->num_comp_vectors = nvec - MLX5_EQ_VEC_COMP_BASE; err = pci_enable_msix(dev->pdev, table->msix_arr, nvec); - if (err <= 0) { + if (err) { + kfree(table->msix_arr); return err; - } else if (err > MLX5_EQ_VEC_COMP_BASE) { - nvec = err; - goto retry; } - mlx5_core_dbg(dev, "received %d MSI vectors out of %d requested\n", err, nvec); - kfree(table->msix_arr); + table->num_comp_vectors = nvec - MLX5_EQ_VEC_COMP_BASE; - return -ENOSPC; + return 0; } static void mlx5_disable_msix(struct mlx5_core_dev *dev) -- 1.7.7.6 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/