diff mbox series

[net-next,01/13] net/mlx5: Correctly set LAG mode for ECPF

Message ID	20190216013452.21131-2-saeedm@mellanox.com
State	Accepted
Delegated to:	David Miller
Headers	show Return-Path: <netdev-owner@vger.kernel.org> From: Saeed Mahameed <saeedm@mellanox.com> To: "David S. Miller" <davem@davemloft.net> Cc: netdev@vger.kernel.org, Bodong Wang <bodong@mellanox.com>, Saeed Mahameed <saeedm@mellanox.com> Subject: [net-next 01/13] net/mlx5: Correctly set LAG mode for ECPF Date: Fri, 15 Feb 2019 17:34:40 -0800 Message-Id: <20190216013452.21131-2-saeedm@mellanox.com> In-Reply-To: <20190216013452.21131-1-saeedm@mellanox.com> References: <20190216013452.21131-1-saeedm@mellanox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk
Series	[net-next,01/13] net/mlx5: Correctly set LAG mode for ECPF \| expand [net-next,01/13] net/mlx5: Correctly set LAG mode for ECPF [net-next,02/13] net/mlx5: E-Switch, Properly refer to the esw manager vport [net-next,03/13] net/mlx5: E-Switch, Properly refer to host PF vport as other vport [net-next,04/13] net/mlx5: E-Switch, Refactor offloads flow steering init/cleanup [net-next,05/13] net/mlx5: E-Switch, Split VF and special vports for offloads mode [net-next,06/13] net/mlx5: E-Switch, Use getter and iterator to access vport/rep [net-next,07/13] net/mlx5: E-Switch, Add state to eswitch vport representors [net-next,08/13] net/mlx5: E-Switch, Support load/unload reps of specific vport types [net-next,09/13] net/mlx5: E-Switch, Centralize repersentor reg/unreg to eswitch driver [net-next,10/13] net/mlx5: E-Switch, Assign a different position for uplink rep and vport [net-next,11/13] net/mlx5: E-Switch, Consider ECPF vport depends on eswitch ownership [net-next,12/13] net/mlx5: E-Switch, Load/unload VF reps according to event from host PF [net-next,13/13] net/mlx5: E-Switch, Allow transition to offloads mode for ECPF

Commit Message

Saeed Mahameed Feb. 16, 2019, 1:34 a.m. UTC

From: Bodong Wang <bodong@mellanox.com>

When bonding is added, driver assumes that it's RoCE LAG if no VF is
enabled. This is not enough for ECPF as the VF is enabled in host PF
side. LAG should only choose RoCE mode when both slave devices meet
conditions below:
 1. E-Switch offloads mode is NONE.
 2. No VF is enabled.

Signed-off-by: Bodong Wang <bodong@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
 drivers/net/ethernet/mellanox/mlx5/core/lag.c | 5 +++++
 1 file changed, 5 insertions(+)

diff mbox series

Patch

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag.c b/drivers/net/ethernet/mellanox/mlx5/core/lag.c
index 2d223385dc81..04c5aca7f8c5 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/lag.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lag.c
@@ -343,6 +343,11 @@  static void mlx5_do_bond(struct mlx5_lag *ldev)
 		roce_lag = !mlx5_sriov_is_enabled(dev0) &&
 			   !mlx5_sriov_is_enabled(dev1);
 
+#ifdef CONFIG_MLX5_ESWITCH
+		roce_lag &= dev0->priv.eswitch->mode == SRIOV_NONE &&
+			    dev1->priv.eswitch->mode == SRIOV_NONE;
+#endif
+
 		if (roce_lag)
 			mlx5_lag_remove_ib_devices(ldev);