On Mon, May 20, 2019 at 12:18:12PM +0300, Michal Kalderon wrote:
> From: Sagiv Ozeri <sagiv.ozeri@xxxxxxxxxxx>
>
> 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")
>
No extra space please.
> Signed-off-by: Sagiv Ozeri <sagiv.ozeri@xxxxxxxxxxx>
> Signed-off-by: Michal Kalderon <michal.kalderon@xxxxxxxxxxx>
> ---
> 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 e52d8761d681..f940da2eb61e 100644
> --- a/drivers/infiniband/hw/qedr/verbs.c
> +++ b/drivers/infiniband/hw/qedr/verbs.c
> @@ -159,54 +159,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.14.5
>
