lkml.org 
[lkml]   [2021]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 352/530] RDMA/mlx5: Fix mlx5 rates to IB rates map
    Date
    From: Mark Zhang <markzhang@nvidia.com>

    [ Upstream commit 6fe6e568639859db960c8fcef19a2ece1c2d7eae ]

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

    Fixes: e126ba97dba9 ("mlx5: Add driver for Mellanox Connect-IB adapters")
    Link: https://lore.kernel.org/r/20210304124517.1100608-4-leon@kernel.org
    Signed-off-by: Mark Zhang <markzhang@nvidia.com>
    Reviewed-by: Maor Gottlieb <maorg@nvidia.com>
    Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
    Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/infiniband/hw/mlx5/qp.c | 15 ++++++++++++++-
    1 file changed, 14 insertions(+), 1 deletion(-)

    diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
    index 75caeec378bd..6d2715f65d78 100644
    --- a/drivers/infiniband/hw/mlx5/qp.c
    +++ b/drivers/infiniband/hw/mlx5/qp.c
    @@ -3079,6 +3079,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) {
    @@ -4420,7 +4433,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),
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-05-12 19:01    [W:4.368 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site