Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 917b41aa authored by Aviv Heller's avatar Aviv Heller Committed by Leon Romanovsky
Browse files

net/mlx5: Configure IB devices according to LAG state 



When mlx5_ib is loaded, we would like each card's IB devices
to be added according to its LAG state (one IB device, instead of
two, is to be added if LAG is active).

Signed-off-by: default avatarAviv Heller <avivh@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent 3bc34f3b

drivers/net/ethernet/mellanox/mlx5/core/lag.c

+17 −0
Original line number Diff line number Diff line
@@ -583,3 +583,20 @@ struct net_device *mlx5_lag_get_roce_netdev(struct mlx5_core_dev *dev) 
}

EXPORT_SYMBOL(mlx5_lag_get_roce_netdev);



bool mlx5_lag_intf_add(struct mlx5_interface *intf, struct mlx5_priv *priv)

{

	struct mlx5_core_dev *dev = container_of(priv, struct mlx5_core_dev,

						 priv);

	struct mlx5_lag *ldev;



	if (intf->protocol != MLX5_INTERFACE_PROTOCOL_IB)

		return true;



	ldev = mlx5_lag_dev_get(dev);

	if (!ldev || !mlx5_lag_is_bonded(ldev) || ldev->pf[0].dev == dev)

		return true;



	/* If bonded, we do not add an IB device for PF1. */

	return false;

}

drivers/net/ethernet/mellanox/mlx5/core/main.c

+3 −0
Original line number Diff line number Diff line
@@ -783,6 +783,9 @@ static void mlx5_add_device(struct mlx5_interface *intf, struct mlx5_priv *priv) 
	struct mlx5_device_context *dev_ctx;

	struct mlx5_core_dev *dev = container_of(priv, struct mlx5_core_dev, priv);



	if (!mlx5_lag_intf_add(intf, priv))

		return;



	dev_ctx = kmalloc(sizeof(*dev_ctx), GFP_KERNEL);

	if (!dev_ctx)

		return;

drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h

+2 −0
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@ void mlx5_lag_remove(struct mlx5_core_dev *dev); 
void mlx5_add_dev_by_protocol(struct mlx5_core_dev *dev, int protocol);

void mlx5_remove_dev_by_protocol(struct mlx5_core_dev *dev, int protocol);



bool mlx5_lag_intf_add(struct mlx5_interface *intf, struct mlx5_priv *priv);



void mlx5e_init(void);

void mlx5e_cleanup(void);