lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 384/639] RDMA/qedr: Fix incorrect device rate.
    Date
    From: Sagiv Ozeri <sagiv.ozeri@marvell.com>

    [ Upstream commit 69054666df0a9b4e8331319f98b6b9a88bc3fcc4 ]

    Use the correct enum value introduced in commit 12113a35ada6 ("IB/core:
    Add HDR speed enum") Prior to this change a 50Gbps port would show 40Gbps.

    This patch also cleaned up the redundant redefiniton of ib speeds for
    qedr.

    Fixes: 12113a35ada6 ("IB/core: Add HDR speed enum")
    Signed-off-by: Sagiv Ozeri <sagiv.ozeri@marvell.com>
    Signed-off-by: Michal Kalderon <michal.kalderon@marvell.com>
    Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/infiniband/hw/qedr/verbs.c | 25 +++++++++----------------
    1 file changed, 9 insertions(+), 16 deletions(-)

    diff --git a/drivers/infiniband/hw/qedr/verbs.c b/drivers/infiniband/hw/qedr/verbs.c
    index 8fd8b97348bfe..38fe2f7413757 100644
    --- a/drivers/infiniband/hw/qedr/verbs.c
    +++ b/drivers/infiniband/hw/qedr/verbs.c
    @@ -158,54 +158,47 @@ int qedr_query_device(struct ib_device *ibdev,
    return 0;
    }

    -#define QEDR_SPEED_SDR (1)
    -#define QEDR_SPEED_DDR (2)
    -#define QEDR_SPEED_QDR (4)
    -#define QEDR_SPEED_FDR10 (8)
    -#define QEDR_SPEED_FDR (16)
    -#define QEDR_SPEED_EDR (32)
    -
    static inline void get_link_speed_and_width(int speed, u8 *ib_speed,
    u8 *ib_width)
    {
    switch (speed) {
    case 1000:
    - *ib_speed = QEDR_SPEED_SDR;
    + *ib_speed = IB_SPEED_SDR;
    *ib_width = IB_WIDTH_1X;
    break;
    case 10000:
    - *ib_speed = QEDR_SPEED_QDR;
    + *ib_speed = IB_SPEED_QDR;
    *ib_width = IB_WIDTH_1X;
    break;

    case 20000:
    - *ib_speed = QEDR_SPEED_DDR;
    + *ib_speed = IB_SPEED_DDR;
    *ib_width = IB_WIDTH_4X;
    break;

    case 25000:
    - *ib_speed = QEDR_SPEED_EDR;
    + *ib_speed = IB_SPEED_EDR;
    *ib_width = IB_WIDTH_1X;
    break;

    case 40000:
    - *ib_speed = QEDR_SPEED_QDR;
    + *ib_speed = IB_SPEED_QDR;
    *ib_width = IB_WIDTH_4X;
    break;

    case 50000:
    - *ib_speed = QEDR_SPEED_QDR;
    - *ib_width = IB_WIDTH_4X;
    + *ib_speed = IB_SPEED_HDR;
    + *ib_width = IB_WIDTH_1X;
    break;

    case 100000:
    - *ib_speed = QEDR_SPEED_EDR;
    + *ib_speed = IB_SPEED_EDR;
    *ib_width = IB_WIDTH_4X;
    break;

    default:
    /* Unsupported */
    - *ib_speed = QEDR_SPEED_SDR;
    + *ib_speed = IB_SPEED_SDR;
    *ib_width = IB_WIDTH_1X;
    }
    }
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:22    [W:2.213 / U:1.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site