From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Jul 2024 16:51:33 +0000 (-0700)
Subject: Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
X-Git-Tag: v6.11-rc1~116
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d51520954154a476bfdacf9427acd1d9538734c;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:
 "Usual collection of small improvements and fixes:

   - Bug fixes and minor improvments in efa, irdma, mlx4, mlx5, rxe,
     hf1, qib, ocrdma

   - bnxt_re support for MSN, which is a new retransmit logic

   - Initial mana support for RC qps

   - Use after free bug and cleanups in iwcm

   - Reduce resource usage in mlx5 when RDMA verbs features are not used

   - New verb to drain shared recieve queues, similar to normal recieve
     queues. This is necessary to allow ULPs a clean shutdown. Used in
     the iscsi rdma target

   - mlx5 support for more than 16 bits of doorbell indexes

   - Doorbell moderation support for bnxt_re

   - IB multi-plane support for mlx5

   - New EFA adaptor PCI IDs

   - RDMA_NAME_ASSIGN_TYPE_USER to hint to userspace that it shouldn't
     rename the device

   - A collection of hns bugs

   - Fix long standing bug in bnxt_re with incorrect endian handling of
     immediate data"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (65 commits)
  IB/hfi1: Constify struct flag_table
  RDMA/mana_ib: Set correct device into ib
  bnxt_re: Fix imm_data endianness
  RDMA: Fix netdev tracker in ib_device_set_netdev
  RDMA/hns: Fix mbx timing out before CMD execution is completed
  RDMA/hns: Fix insufficient extend DB for VFs.
  RDMA/hns: Fix undifined behavior caused by invalid max_sge
  RDMA/hns: Fix shift-out-bounds when max_inline_data is 0
  RDMA/hns: Fix missing pagesize and alignment check in FRMR
  RDMA/hns: Fix unmatch exception handling when init eq table fails
  RDMA/hns: Fix soft lockup under heavy CEQE load
  RDMA/hns: Check atomic wr length
  RDMA/ocrdma: Don't inline statistics functions
  RDMA/core: Introduce "name_assign_type" for an IB device
  RDMA/qib: Fix truncation compilation warnings in qib_verbs.c
  RDMA/qib: Fix truncation compilation warnings in qib_init.c
  RDMA/efa: Add EFA 0xefa3 PCI ID
  RDMA/mlx5: Support per-plane port IB counters by querying PPCNT register
  net/mlx5: mlx5_ifc update for accessing ppcnt register of plane ports
  RDMA/mlx5: Add plane index support when querying PTYS registers
  ...
---

3d51520954154a476bfdacf9427acd1d9538734c
diff --cc include/linux/mlx5/mlx5_ifc.h
index c176953edcf8f,5fea7b747607d..cab228cf51c63
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@@ -1992,11 -1990,10 +1992,12 @@@ struct mlx5_ifc_cmd_hca_cap_2_bits 
  	u8	   reserved_at_c0[0x8];
  	u8	   migration_multi_load[0x1];
  	u8	   migration_tracking_state[0x1];
- 	u8	   reserved_at_ca[0x6];
+ 	u8	   multiplane_qp_ud[0x1];
+ 	u8	   reserved_at_cb[0x5];
  	u8	   migration_in_chunks[0x1];
 -	u8	   reserved_at_d1[0xf];
 +	u8	   reserved_at_d1[0x1];
 +	u8	   sf_eq_usage[0x1];
 +	u8	   reserved_at_d3[0xd];
  
  	u8	   cross_vhca_object_to_object_supported[0x20];