From: Doug Ledford <dledford@redhat.com>
Date: Wed, 14 Dec 2016 19:44:25 +0000 (-0500)
Subject: Merge branch 'mlx' into merge-test
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=86ef0beaa0bdbec70d4261977b8b4a100fe54bfe;p=linux-beck.git

Merge branch 'mlx' into merge-test
---

86ef0beaa0bdbec70d4261977b8b4a100fe54bfe
diff --cc drivers/infiniband/hw/hns/hns_roce_device.h
index d4f0fce98587,470615f7b517..1a6cb5d7a0dd
--- a/drivers/infiniband/hw/hns/hns_roce_device.h
+++ b/drivers/infiniband/hw/hns/hns_roce_device.h
@@@ -684,10 -665,10 +684,11 @@@ void hns_roce_cleanup_bitmap(struct hns
  int hns_roce_bitmap_alloc_range(struct hns_roce_bitmap *bitmap, int cnt,
  				int align, unsigned long *obj);
  void hns_roce_bitmap_free_range(struct hns_roce_bitmap *bitmap,
 -				unsigned long obj, int cnt);
 +				unsigned long obj, int cnt,
 +				int rr);
  
- struct ib_ah *hns_roce_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr);
+ struct ib_ah *hns_roce_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr,
+ 				 struct ib_udata *udata);
  int hns_roce_query_ah(struct ib_ah *ibah, struct ib_ah_attr *ah_attr);
  int hns_roce_destroy_ah(struct ib_ah *ah);
  
diff --cc drivers/infiniband/hw/mlx4/main.c
index 1b54786d13d0,4a67ffc1ddfb..6c61cf9a16a6
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@@ -2814,17 -2817,25 +2817,22 @@@ static void *mlx4_ib_add(struct mlx4_de
  			kmalloc(BITS_TO_LONGS(ibdev->steer_qpn_count) *
  				sizeof(long),
  				GFP_KERNEL);
 -		if (!ibdev->ib_uc_qpns_bitmap) {
 -			dev_err(&dev->persist->pdev->dev,
 -				"bit map alloc failed\n");
 +		if (!ibdev->ib_uc_qpns_bitmap)
  			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++)