From patchwork Sun Dec 4 14:29:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: jackm X-Patchwork-Id: 129154 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 766321007D5 for ; Mon, 5 Dec 2011 01:29:27 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753951Ab1LDO3U (ORCPT ); Sun, 4 Dec 2011 09:29:20 -0500 Received: from mail-ee0-f46.google.com ([74.125.83.46]:38139 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753749Ab1LDO3T convert rfc822-to-8bit (ORCPT ); Sun, 4 Dec 2011 09:29:19 -0500 Received: by eeaq14 with SMTP id q14so1504806eea.19 for ; Sun, 04 Dec 2011 06:29:18 -0800 (PST) Received: by 10.14.17.16 with SMTP id i16mr391666eei.191.1323008957887; Sun, 04 Dec 2011 06:29:17 -0800 (PST) Received: from [10.0.1.180] (212.199.99.37.static.012.net.il. [212.199.99.37]) by mx.google.com with ESMTPS id 65sm23661107eeg.8.2011.12.04.06.29.16 (version=SSLv3 cipher=OTHER); Sun, 04 Dec 2011 06:29:17 -0800 (PST) From: Jack Morgenstein Organization: Mellanox To: Roland Dreier Subject: Re: [PATCH net-next V0 19/21] mlx4_core: Modify driver initialization flow to accommodate SRIOV for Ethernet Date: Sun, 4 Dec 2011 16:29:41 +0200 User-Agent: KMail/1.9.1 Cc: Yevgeny Petrilin , davem@davemloft.net, netdev@vger.kernel.org, linux-rdma@vger.kernel.org, liranl@mellanox.co.il References: <4ED8A636.40901@mellanox.co.il> In-Reply-To: MIME-Version: 1.0 Content-Disposition: inline Message-Id: <201112041629.41466.jackm@dev.mellanox.co.il> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Friday 02 December 2011 19:51, Roland Dreier wrote: > >  #else /* CONFIG_PCI_IOV */ > > +static int sr_iov; > > +#define probe_vf 0 > >  int mlx4_log_num_mgm_entry_size = 9; > >  #endif /* CONFIG_PCI_IOV */ > > I don't think it's a good idea to put module parameters inside an > #ifdef.  Then depending on the > kernel config someone compiles with, their modprobe.conf may or may not break. > I agree. I will change this so that the module parameters are always there. If the kernel is not configured to support IOV, pci_enable_sriov will fail. Currently, we abort the device startup. I can change this to simply continue without sriov enabled: - Jack --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html ====================================================== mlx4_core: fix sriov module parameters Always have the sr_iov module parameters (even if the kernel is not compiled with sriov support). Change device startup logic so that if pci_enable_sriov() fails, the PF-driver continues to bring up the device, but in non-sriov mode. Signed-off-by: Jack Morgenstein --- Roland, I will roll this change into the original patch set, so that V1 will contain this code. Index: net-next/drivers/net/ethernet/mellanox/mlx4/main.c =================================================================== --- net-next.orig/drivers/net/ethernet/mellanox/mlx4/main.c 2011-12-04 10:38:52.000000000 +0200 +++ net-next/drivers/net/ethernet/mellanox/mlx4/main.c 2011-12-04 16:23:33.000000000 +0200 @@ -76,8 +76,6 @@ MODULE_PARM_DESC(msi_x, "attempt to use #endif /* CONFIG_PCI_MSI */ -#ifdef CONFIG_PCI_IOV - static int sr_iov; module_param(sr_iov, int, 0444); MODULE_PARM_DESC(sr_iov, "enable #sr_iov functions if sr_iov > 0"); @@ -94,12 +92,6 @@ MODULE_PARM_DESC(log_num_mgm_entry_size, " 10 gives 248.range: 9<=" " log_num_mgm_entry_size <= 12"); -#else /* CONFIG_PCI_IOV */ -static int sr_iov; -#define probe_vf 0 -int mlx4_log_num_mgm_entry_size = 9; -#endif /* CONFIG_PCI_IOV */ - #define MLX4_VF (1 << 0) #define HCA_GLOBAL_CAP_MASK 0 @@ -1732,13 +1724,19 @@ static int __mlx4_init_one(struct pci_de if (sr_iov) { mlx4_warn(dev, "Enabling sriov with:%d vfs\n", sr_iov); - if (pci_enable_sriov(pdev, sr_iov)) { - mlx4_err(dev, "Failed to enable sriov, aborting.\n"); - goto err_rel_own; + err = pci_enable_sriov(pdev, sr_iov); + if (err) { + mlx4_err(dev, "Failed to enable sriov," + "continuing without sriov enabled" + " (err = %d).\n", err); + sr_iov = 0; + err = 0; + } else { + mlx4_warn(dev, "Running in master mode\n"); + dev->flags |= MLX4_FLAG_SRIOV | + MLX4_FLAG_MASTER; + dev->sr_iov = sr_iov; } - mlx4_warn(dev, "Running in master mode\n"); - dev->flags |= MLX4_FLAG_SRIOV | MLX4_FLAG_MASTER; - dev->sr_iov = sr_iov; } /*