Commit 34a30d76 authored by Mark Bloch's avatar Mark Bloch Committed by Saeed Mahameed
Browse files

net/mlx5: Lag, expose number of lag ports 



Downstream patches will add support for hardware lag with
more than 2 ports. Add a way for users to query the number of lag ports.

Signed-off-by: default avatarMark Bloch <mbloch@nvidia.com>
Reviewed-by: default avatarMaor Gottlieb <maorg@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 37ca95e6

drivers/infiniband/hw/mlx5/gsi.c

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ int mlx5_ib_create_gsi(struct ib_pd *pd, struct mlx5_ib_qp *mqp, 
				 port_type) == MLX5_CAP_PORT_TYPE_IB)

			num_qps = pd->device->attrs.max_pkeys;

		else if (dev->lag_active)

			num_qps = MLX5_MAX_PORTS;

			num_qps = dev->lag_ports;

	}



	gsi = &mqp->gsi;

drivers/infiniband/hw/mlx5/main.c

+1 −0
Original line number Diff line number Diff line
@@ -2991,6 +2991,7 @@ static int mlx5_eth_lag_init(struct mlx5_ib_dev *dev) 
	}



	dev->flow_db->lag_demux_ft = ft;

	dev->lag_ports = mlx5_lag_get_num_ports(mdev);

	dev->lag_active = true;

	return 0;

drivers/infiniband/hw/mlx5/mlx5_ib.h

+1 −0
Original line number Diff line number Diff line
@@ -1131,6 +1131,7 @@ struct mlx5_ib_dev { 
	struct xarray sig_mrs;

	struct mlx5_port_caps port_caps[MLX5_MAX_PORTS];

	u16 pkey_table_len;

	u8 lag_ports;

};



static inline struct mlx5_ib_cq *to_mibcq(struct mlx5_core_cq *mcq)

drivers/infiniband/hw/mlx5/qp.c

+1 −1
Original line number Diff line number Diff line
@@ -3907,7 +3907,7 @@ static unsigned int get_tx_affinity_rr(struct mlx5_ib_dev *dev, 
		tx_port_affinity = &dev->port[port_num].roce.tx_port_affinity;



	return (unsigned int)atomic_add_return(1, tx_port_affinity) %

		MLX5_MAX_PORTS + 1;

		(dev->lag_active ? dev->lag_ports : MLX5_CAP_GEN(dev->mdev, num_lag_ports)) + 1;

}



static bool qp_supports_affinity(struct mlx5_ib_qp *qp)

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

+6 −0
Original line number Diff line number Diff line
@@ -1185,6 +1185,12 @@ u8 mlx5_lag_get_slave_port(struct mlx5_core_dev *dev, 
}

EXPORT_SYMBOL(mlx5_lag_get_slave_port);



u8 mlx5_lag_get_num_ports(struct mlx5_core_dev *dev)

{

	return MLX5_MAX_PORTS;

}

EXPORT_SYMBOL(mlx5_lag_get_num_ports);



struct mlx5_core_dev *mlx5_lag_get_peer_mdev(struct mlx5_core_dev *dev)

{

	struct mlx5_core_dev *peer_dev = NULL;