Upgrade to 4.4.50-rt62

[kvmfornfv.git] / kernel / drivers / infiniband / hw / mlx4 / main.c

diff --git a/kernel/drivers/infiniband/hw/mlx4/main.c b/kernel/drivers/infiniband/hw/mlx4/main.c
index 97d6878..77ddf2f 100644 (file)
--- a/kernel/drivers/infiniband/hw/mlx4/main.c
+++ b/kernel/drivers/infiniband/hw/mlx4/main.c
@@ -630,9 +630,11 @@ static int eth_link_query_port(struct ib_device *ibdev, u8 port,
        if (err)
                goto out;
 
-       props->active_width     =  (((u8 *)mailbox->buf)[5] == 0x40) ?
-                                               IB_WIDTH_4X : IB_WIDTH_1X;
-       props->active_speed     = IB_SPEED_QDR;
+       props->active_width     =  (((u8 *)mailbox->buf)[5] == 0x40) ||
+                                  (((u8 *)mailbox->buf)[5] == 0x20 /*56Gb*/) ?
+                                          IB_WIDTH_4X : IB_WIDTH_1X;
+       props->active_speed     =  (((u8 *)mailbox->buf)[5] == 0x20 /*56Gb*/) ?
+                                          IB_SPEED_FDR : IB_SPEED_QDR;
        props->port_cap_flags   = IB_PORT_CM_SUP | IB_PORT_IP_BASED_GIDS;
        props->gid_tbl_len      = mdev->dev->caps.gid_table_len[port];
        props->max_msg_sz       = mdev->dev->caps.max_msg_sz;
@@ -2401,14 +2403,19 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
                        goto err_steer_qp_release;
                }
 
-               bitmap_zero(ibdev->ib_uc_qpns_bitmap, ibdev->steer_qpn_count);
-
-               err = mlx4_FLOW_STEERING_IB_UC_QP_RANGE(
-                               dev, ibdev->steer_qpn_base,
-                               ibdev->steer_qpn_base +
-                               ibdev->steer_qpn_count - 1);
-               if (err)
-                       goto err_steer_free_bitmap;
+               if (dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_DMFS_IPOIB) {
+                       bitmap_zero(ibdev->ib_uc_qpns_bitmap,
+                                   ibdev->steer_qpn_count);
+                       err = mlx4_FLOW_STEERING_IB_UC_QP_RANGE(
+                                       dev, ibdev->steer_qpn_base,
+                                       ibdev->steer_qpn_base +
+                                       ibdev->steer_qpn_count - 1);
+                       if (err)
+                               goto err_steer_free_bitmap;
+               } else {
+                       bitmap_fill(ibdev->ib_uc_qpns_bitmap,
+                                   ibdev->steer_qpn_count);
+               }
        }
 
        for (j = 1; j <= ibdev->dev->caps.num_ports; j++)