IB/mlx5: Add 2X width support to query_port

Report to the user 2x width over MAD interface.

Signed-off-by: Michael Guralnik <michaelgur@mellanox.com>
Reviewed-by: Majd Dibbiny <majd@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/hw/mlx5/mad.c b/drivers/infiniband/hw/mlx5/mad.c
index a2735f246d5c64a90445cdbc96f8bd04b301b69c..00e5d29517ca0ba0405cc9c41e1dd165b8501d02 100644 (file)
--- a/drivers/infiniband/hw/mlx5/mad.c
+++ b/drivers/infiniband/hw/mlx5/mad.c
@@ -568,10 +568,14 @@ int mlx5_query_mad_ifc_port(struct ib_device *ibdev, u8 port,
        props->max_vl_num       = out_mad->data[37] >> 4;
        props->init_type_reply  = out_mad->data[41] >> 4;
 
-       if (props->port_cap_flags & IB_PORT_CAP_MASK2_SUP)
+       if (props->port_cap_flags & IB_PORT_CAP_MASK2_SUP) {
                props->port_cap_flags2 =
                        be16_to_cpup((__be16 *)(out_mad->data + 60));
 
+               if (props->port_cap_flags2 & IB_PORT_LINK_WIDTH_2X_SUP)
+                       props->active_width = out_mad->data[31] & 0x1f;
+       }
+
        /* Check if extended speeds (EDR/FDR/...) are supported */
        if (props->port_cap_flags & IB_PORT_EXTENDED_SPEEDS_SUP) {
                ext_active_speed = out_mad->data[62] >> 4;

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 5edd8d5f151f9650064fb2b52e71f1a167f7abea..af091f363b81b4163a0b16d52d7c97038dfbed75 100644 (file)
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -1108,6 +1108,8 @@ static void translate_active_width(struct ib_device *ibdev, u8 active_width,
 
        if (active_width & MLX5_IB_WIDTH_1X)
                *ib_width = IB_WIDTH_1X;
+       else if (active_width & MLX5_IB_WIDTH_2X)
+               *ib_width = IB_WIDTH_2X;
        else if (active_width & MLX5_IB_WIDTH_4X)
                *ib_width = IB_WIDTH_4X;
        else if (active_width & MLX5_IB_WIDTH_8X)