From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Nov 2019 18:17:28 +0000 (-0800)
Subject: Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
X-Git-Tag: v5.10.7~3802
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d76886972823ce456c0c61cd2284e85668e2131e;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'for-linus' of git://git./linux/kernel/git/rdma/rdma

Pull rdma updates from Jason Gunthorpe:
 "Again another fairly quiet cycle with few notable core code changes
  and the usual variety of driver bug fixes and small improvements.

   - Various driver updates and bug fixes for siw, bnxt_re, hns, qedr,
     iw_cxgb4, vmw_pvrdma, mlx5

   - Improvements in SRPT from working with iWarp

   - SRIOV VF support for bnxt_re

   - Skeleton kernel-doc files for drivers/infiniband

   - User visible counters for events related to ODP

   - Common code for tracking of mmap lifetimes so that drivers can link
     HW object liftime to a VMA

   - ODP bug fixes and rework

   - RDMA READ support for efa

   - Removal of the very old cxgb3 driver"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (168 commits)
  RDMA/hns: Delete unnecessary callback functions for cq
  RDMA/hns: Rename the functions used inside creating cq
  RDMA/hns: Redefine the member of hns_roce_cq struct
  RDMA/hns: Redefine interfaces used in creating cq
  RDMA/efa: Expose RDMA read related attributes
  RDMA/efa: Support remote read access in MR registration
  RDMA/efa: Store network attributes in device attributes
  IB/hfi1: remove redundant assignment to variable ret
  RDMA/bnxt_re: Fix missing le16_to_cpu
  RDMA/bnxt_re: Fix stat push into dma buffer on gen p5 devices
  RDMA/bnxt_re: Fix chip number validation Broadcom's Gen P5 series
  RDMA/bnxt_re: Fix Kconfig indentation
  IB/mlx5: Implement callbacks for getting VFs GUID attributes
  IB/ipoib: Add ndo operation for getting VFs GUID attributes
  IB/core: Add interfaces to get VF node and port GUIDs
  net/core: Add support for getting VF GUIDs
  RDMA/qedr: Fix null-pointer dereference when calling rdma_user_mmap_get_offset
  RDMA/cm: Use refcount_t type for refcount variable
  IB/mlx5: Support extended number of strides for Striding RQ
  IB/mlx4: Update HW GID table while adding vlan GID
  ...
---

d76886972823ce456c0c61cd2284e85668e2131e
diff --cc drivers/infiniband/hw/hns/hns_roce_srq.c
index 43ea2c1,0cceae0..7113ebf
--- a/drivers/infiniband/hw/hns/hns_roce_srq.c
+++ b/drivers/infiniband/hw/hns/hns_roce_srq.c
@@@ -373,10 -377,10 +377,10 @@@ int hns_roce_create_srq(struct ib_srq *
  	mutex_init(&srq->mutex);
  	spin_lock_init(&srq->lock);
  
- 	srq->max = roundup_pow_of_two(srq_init_attr->attr.max_wr + 1);
- 	srq->max_gs = srq_init_attr->attr.max_sge;
+ 	srq->wqe_cnt = roundup_pow_of_two(init_attr->attr.max_wr + 1);
+ 	srq->max_gs = init_attr->attr.max_sge;
  
 -	srq_desc_size = max(16, 16 * srq->max_gs);
 +	srq_desc_size = roundup_pow_of_two(max(16, 16 * srq->max_gs));
  
  	srq->wqe_shift = ilog2(srq_desc_size);