Commit 6fe6e568 authored by Mark Zhang's avatar Mark Zhang Committed by Jason Gunthorpe
Browse files

RDMA/mlx5: Fix mlx5 rates to IB rates map 

Correct the map between mlx5 rates and corresponding ib rates, as they
don't always have a fixed offset between them.

Fixes: e126ba97 ("mlx5: Add driver for Mellanox Connect-IB adapters")
Link: https://lore.kernel.org/r/20210304124517.1100608-4-leon@kernel.org


Signed-off-by: default avatarMark Zhang <markzhang@nvidia.com>
Reviewed-by: default avatarMaor Gottlieb <maorg@nvidia.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 7852546f

drivers/infiniband/hw/mlx5/qp.c

+14 −1
Original line number Diff line number Diff line
@@ -3142,6 +3142,19 @@ enum { 
	MLX5_PATH_FLAG_COUNTER	= 1 << 2,

};



static int mlx5_to_ib_rate_map(u8 rate)

{

	static const int rates[] = { IB_RATE_PORT_CURRENT, IB_RATE_56_GBPS,

				     IB_RATE_25_GBPS,	   IB_RATE_100_GBPS,

				     IB_RATE_200_GBPS,	   IB_RATE_50_GBPS,

				     IB_RATE_400_GBPS };



	if (rate < ARRAY_SIZE(rates))

		return rates[rate];



	return rate - MLX5_STAT_RATE_OFFSET;

}



static int ib_to_mlx5_rate_map(u8 rate)

{

	switch (rate) {
@@ -4481,7 +4494,7 @@ static void to_rdma_ah_attr(struct mlx5_ib_dev *ibdev, 
	rdma_ah_set_path_bits(ah_attr, MLX5_GET(ads, path, mlid));



	static_rate = MLX5_GET(ads, path, stat_rate);

	rdma_ah_set_static_rate(ah_attr, static_rate ? static_rate - 5 : 0);

	rdma_ah_set_static_rate(ah_attr, mlx5_to_ib_rate_map(static_rate));

	if (MLX5_GET(ads, path, grh) ||

	    ah_attr->type == RDMA_AH_ATTR_TYPE_ROCE) {

		rdma_ah_set_grh(ah_attr, NULL, MLX5_GET(ads, path, flow_label),