From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 23 Nov 2024 04:03:57 +0000 (-0800)
Subject: Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
X-Git-Tag: v6.13-rc1~104
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a163a4cea153348172e260a0c5b5569103a66a3;p=thirdparty%2Fkernel%2Flinux.git

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

Pull rdma updates from Jason Gunthorpe:
 "Seveal fixes scattered across the drivers and a few new features:

   - Minor updates and bug fixes to hfi1, efa, iopob, bnxt, hns

   - Force disassociate the userspace FD when hns does an async reset

   - bnxt new features for optimized modify QP to skip certain stayes,
     CQ coalescing, better debug dumping

   - mlx5 new data placement ordering feature

   - Faster destruction of mlx5 devx HW objects

   - Improvements to RDMA CM mad handling"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (51 commits)
  RDMA/bnxt_re: Correct the sequence of device suspend
  RDMA/bnxt_re: Use the default mode of congestion control
  RDMA/bnxt_re: Support different traffic class
  IB/cm: Rework sending DREQ when destroying a cm_id
  IB/cm: Do not hold reference on cm_id unless needed
  IB/cm: Explicitly mark if a response MAD is a retransmission
  RDMA/mlx5: Move events notifier registration to be after device registration
  RDMA/bnxt_re: Cache MSIx info to a local structure
  RDMA/bnxt_re: Refurbish CQ to NQ hash calculation
  RDMA/bnxt_re: Refactor NQ allocation
  RDMA/bnxt_re: Fail probe early when not enough MSI-x vectors are reserved
  RDMA/hns: Fix different dgids mapping to the same dip_idx
  RDMA/bnxt_re: Add set_func_resources support for P5/P7 adapters
  RDMA/bnxt_re: Enhance RoCE SRIOV resource configuration design
  bnxt_en: Add support for RoCE sriov configuration
  RDMA/hns: Fix NULL pointer derefernce in hns_roce_map_mr_sg()
  RDMA/hns: Fix out-of-order issue of requester when setting FENCE
  RDMA/nldev: Add IB device and net device rename events
  RDMA/mlx5: Add implementation for ufile_hw_cleanup device operation
  RDMA/core: Move ib_uverbs_file struct to uverbs_types.h
  ...
---

2a163a4cea153348172e260a0c5b5569103a66a3
diff --cc drivers/infiniband/hw/bnxt_re/main.c
index 9eb290ec71a85,298c848f3a4dc..b7af0d5ff3b64
--- a/drivers/infiniband/hw/bnxt_re/main.c
+++ b/drivers/infiniband/hw/bnxt_re/main.c
@@@ -333,8 -343,11 +340,8 @@@ static void bnxt_re_start_irq(void *han
  	struct bnxt_qplib_nq *nq;
  	int indx, rc;
  
 -	if (!en_info)
 -		return;
 -
  	rdev = en_info->rdev;
- 	msix_ent = rdev->en_dev->msix_entries;
+ 	msix_ent = rdev->nqr->msix_entries;
  	rcfw = &rdev->rcfw;
  	if (!ent) {
  		/* Not setting the f/w timeout bit in rcfw.
@@@ -2074,14 -2377,10 +2372,7 @@@ static int bnxt_re_resume(struct auxili
  	struct bnxt_re_en_dev_info *en_info = auxiliary_get_drvdata(adev);
  	struct bnxt_re_dev *rdev;
  
 -	if (!en_info)
 -		return 0;
 -
  	mutex_lock(&bnxt_re_mutex);
- 	/* L2 driver may invoke this callback during device recovery, resume.
- 	 * reset. Current RoCE driver doesn't recover the device in case of
- 	 * error. Handle the error by dispatching fatal events to all qps
- 	 * ie. by calling bnxt_re_dev_stop and release the MSIx vectors as
- 	 * L2 driver want to modify the MSIx table.
- 	 */
- 
  	bnxt_re_add_device(adev, BNXT_RE_POST_RECOVERY_INIT);
  	rdev = en_info->rdev;
  	ibdev_info(&rdev->ibdev, "Device resume completed");