From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 21 Feb 2015 20:53:21 +0000 (-0800)
Subject: Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... 
X-Git-Tag: v4.13~5689
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b5ccb078c806f4804aaf85bb59faa9b6fedf85a7;p=mirror_ubuntu-bionic-kernel.git

Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

Pull InfiniBand/RDMA updates from Roland Dreier:
 - Re-enable on-demand paging changes with stable ABI
 - Fairly large set of ocrdma HW driver fixes
 - Some qib HW driver fixes
 - Other miscellaneous changes

* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (43 commits)
  IB/qib: Add blank line after declaration
  IB/qib: Fix checkpatch warnings
  IB/mlx5: Enable the ODP capability query verb
  IB/core: Add on demand paging caps to ib_uverbs_ex_query_device
  IB/core: Add support for extended query device caps
  RDMA/cxgb4: Don't hang threads forever waiting on WR replies
  RDMA/ocrdma: Fix off by one in ocrdma_query_gid()
  RDMA/ocrdma: Use unsigned for bit index
  RDMA/ocrdma: Help gcc generate better code for ocrdma_srq_toggle_bit
  RDMA/ocrdma: Update the ocrdma module version string
  RDMA/ocrdma: set vlan present bit for user AH
  RDMA/ocrdma: remove reference of ocrdma_dev out of ocrdma_qp structure
  RDMA/ocrdma: Add support for interrupt moderation
  RDMA/ocrdma: Honor return value of ocrdma_resolve_dmac
  RDMA/ocrdma: Allow expansion of the SQ CQEs via buddy CQ expansion of the QP
  RDMA/ocrdma: Discontinue support of RDMA-READ-WITH-INVALIDATE
  RDMA/ocrdma: Host crash on destroying device resources
  RDMA/ocrdma: Report correct state in ibv_query_qp
  RDMA/ocrdma: Debugfs enhancments for ocrdma driver
  RDMA/ocrdma: Report correct count of interrupt vectors while registering ocrdma device
  ...
---

b5ccb078c806f4804aaf85bb59faa9b6fedf85a7
diff --cc drivers/infiniband/hw/mlx4/main.c
index eb8e215f1613,0b280b1c98df..ac6e2b710ea6
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@@ -1266,12 -1219,10 +1266,11 @@@ static int mlx4_ib_mcg_attach(struct ib
  {
  	int err;
  	struct mlx4_ib_dev *mdev = to_mdev(ibqp->device);
 +	struct mlx4_dev	*dev = mdev->dev;
  	struct mlx4_ib_qp *mqp = to_mqp(ibqp);
 -	u64 reg_id;
  	struct mlx4_ib_steering *ib_steering = NULL;
- 	enum mlx4_protocol prot = (gid->raw[1] == 0x0e) ?
- 		MLX4_PROT_IB_IPV4 : MLX4_PROT_IB_IPV6;
+ 	enum mlx4_protocol prot = MLX4_PROT_IB_IPV6;
 +	struct mlx4_flow_reg_id	reg_id;
  
  	if (mdev->dev->caps.steering_mode ==
  	    MLX4_STEERING_MODE_DEVICE_MANAGED) {
@@@ -1283,21 -1234,12 +1282,23 @@@
  	err = mlx4_multicast_attach(mdev->dev, &mqp->mqp, gid->raw, mqp->port,
  				    !!(mqp->flags &
  				       MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK),
 -				    prot, &reg_id);
 +				    prot, &reg_id.id);
- 	if (err)
+ 	if (err) {
+ 		pr_err("multicast attach op failed, err %d\n", err);
  		goto err_malloc;
+ 	}
  
 +	reg_id.mirror = 0;
 +	if (mlx4_is_bonded(dev)) {
 +		err = mlx4_multicast_attach(mdev->dev, &mqp->mqp, gid->raw,
 +					    (mqp->port == 1) ? 2 : 1,
 +					    !!(mqp->flags &
 +					    MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK),
 +					    prot, &reg_id.mirror);
 +		if (err)
 +			goto err_add;
 +	}
 +
  	err = add_gid_entry(ibqp, gid);
  	if (err)
  		goto err_add;
@@@ -1347,10 -1285,8 +1348,8 @@@ static int mlx4_ib_mcg_detach(struct ib
  	struct mlx4_ib_qp *mqp = to_mqp(ibqp);
  	struct net_device *ndev;
  	struct mlx4_ib_gid_entry *ge;
 -	u64 reg_id = 0;
 +	struct mlx4_flow_reg_id reg_id = {0, 0};
- 
- 	enum mlx4_protocol prot = (gid->raw[1] == 0x0e) ?
- 		MLX4_PROT_IB_IPV4 : MLX4_PROT_IB_IPV6;
+ 	enum mlx4_protocol prot =  MLX4_PROT_IB_IPV6;
  
  	if (mdev->dev->caps.steering_mode ==
  	    MLX4_STEERING_MODE_DEVICE_MANAGED) {