Skip to content

Commit 6b2a21b

Browse files
committed
Update kernel headers
To commit: 563e1feb5f6e ("RDMA/irdma: Add SRQ support"). Signed-off-by: Tatyana Nikolova <tatyana.e.nikolova@intel.com>
1 parent 0e79664 commit 6b2a21b

9 files changed

Lines changed: 4 additions & 69 deletions

File tree

kernel-headers/rdma/bnxt_re-abi.h

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ enum {
5656
BNXT_RE_UCNTX_CMASK_DBR_PACING_ENABLED = 0x08ULL,
5757
BNXT_RE_UCNTX_CMASK_POW2_DISABLED = 0x10ULL,
5858
BNXT_RE_UCNTX_CMASK_MSN_TABLE_ENABLED = 0x40,
59-
BNXT_RE_UCNTX_CMASK_QP_RATE_LIMIT_ENABLED = 0x80ULL,
6059
};
6160

6261
enum bnxt_re_wqe_mode {
@@ -216,19 +215,4 @@ enum bnxt_re_toggle_mem_methods {
216215
BNXT_RE_METHOD_GET_TOGGLE_MEM = (1U << UVERBS_ID_NS_SHIFT),
217216
BNXT_RE_METHOD_RELEASE_TOGGLE_MEM,
218217
};
219-
220-
struct bnxt_re_packet_pacing_caps {
221-
__u32 qp_rate_limit_min;
222-
__u32 qp_rate_limit_max; /* In kbps */
223-
/* Corresponding bit will be set if qp type from
224-
* 'enum ib_qp_type' is supported, e.g.
225-
* supported_qpts |= 1 << IB_QPT_RC
226-
*/
227-
__u32 supported_qpts;
228-
__u32 reserved;
229-
};
230-
231-
struct bnxt_re_query_device_ex_resp {
232-
struct bnxt_re_packet_pacing_caps packet_pacing_caps;
233-
};
234218
#endif /* __BNXT_RE_UVERBS_ABI_H__*/

kernel-headers/rdma/efa-abi.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */
22
/*
3-
* Copyright 2018-2026 Amazon.com, Inc. or its affiliates. All rights reserved.
3+
* Copyright 2018-2025 Amazon.com, Inc. or its affiliates. All rights reserved.
44
*/
55

66
#ifndef EFA_ABI_USER_H
@@ -44,8 +44,7 @@ struct efa_ibv_alloc_ucontext_resp {
4444
__u32 max_llq_size; /* bytes */
4545
__u16 max_tx_batch; /* units of 64 bytes */
4646
__u16 min_sq_wr;
47-
__u16 inline_buf_size_ex;
48-
__u8 reserved_b0[2];
47+
__u8 reserved_a0[4];
4948
};
5049

5150
struct efa_ibv_alloc_pd_resp {

kernel-headers/rdma/ib_user_ioctl_cmds.h

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ enum uverbs_default_objects {
5656
UVERBS_OBJECT_COUNTERS,
5757
UVERBS_OBJECT_ASYNC_EVENT,
5858
UVERBS_OBJECT_DMAH,
59-
UVERBS_OBJECT_DMABUF,
6059
};
6160

6261
enum {
@@ -74,7 +73,6 @@ enum uverbs_methods_device {
7473
UVERBS_METHOD_QUERY_CONTEXT,
7574
UVERBS_METHOD_QUERY_GID_TABLE,
7675
UVERBS_METHOD_QUERY_GID_ENTRY,
77-
UVERBS_METHOD_QUERY_PORT_SPEED,
7876
};
7977

8078
enum uverbs_attrs_invoke_write_cmd_attr_ids {
@@ -88,11 +86,6 @@ enum uverbs_attrs_query_port_cmd_attr_ids {
8886
UVERBS_ATTR_QUERY_PORT_RESP,
8987
};
9088

91-
enum uverbs_attrs_query_port_speed_cmd_attr_ids {
92-
UVERBS_ATTR_QUERY_PORT_SPEED_PORT_NUM,
93-
UVERBS_ATTR_QUERY_PORT_SPEED_RESP,
94-
};
95-
9689
enum uverbs_attrs_get_context_attr_ids {
9790
UVERBS_ATTR_GET_CONTEXT_NUM_COMP_VECTORS,
9891
UVERBS_ATTR_GET_CONTEXT_CORE_SUPPORT,
@@ -264,15 +257,6 @@ enum uverbs_methods_dmah {
264257
UVERBS_METHOD_DMAH_FREE,
265258
};
266259

267-
enum uverbs_attrs_alloc_dmabuf_cmd_attr_ids {
268-
UVERBS_ATTR_ALLOC_DMABUF_HANDLE,
269-
UVERBS_ATTR_ALLOC_DMABUF_PGOFF,
270-
};
271-
272-
enum uverbs_methods_dmabuf {
273-
UVERBS_METHOD_DMABUF_ALLOC,
274-
};
275-
276260
enum uverbs_attrs_reg_dm_mr_cmd_attr_ids {
277261
UVERBS_ATTR_REG_DM_MR_HANDLE,
278262
UVERBS_ATTR_REG_DM_MR_OFFSET,

kernel-headers/rdma/irdma-abi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ struct irdma_alloc_ucontext_resp {
5757
__u8 rsvd2;
5858
__aligned_u64 comp_mask;
5959
__u16 min_hw_wq_size;
60-
__u8 revd3[2];
6160
__u32 max_hw_srq_quanta;
61+
__u8 rsvd3[2];
6262
};
6363

6464
struct irdma_alloc_pd_resp {

kernel-headers/rdma/mana-abi.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
#define MANA_IB_UVERBS_ABI_VERSION 1
1818

1919
enum mana_ib_create_cq_flags {
20-
/* Reserved for backward compatibility. Legacy
21-
* kernel versions use it to create CQs in RNIC
22-
*/
2320
MANA_IB_CREATE_RNIC_CQ = 1 << 0,
2421
};
2522

kernel-headers/rdma/mlx5_user_ioctl_cmds.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ enum mlx5_ib_var_alloc_attrs {
139139
MLX5_IB_ATTR_VAR_OBJ_ALLOC_MMAP_OFFSET,
140140
MLX5_IB_ATTR_VAR_OBJ_ALLOC_MMAP_LENGTH,
141141
MLX5_IB_ATTR_VAR_OBJ_ALLOC_PAGE_ID,
142-
MLX5_IB_ATTR_VAR_OBJ_ALLOC_FLAGS,
143142
};
144143

145144
enum mlx5_ib_var_obj_destroy_attrs {

kernel-headers/rdma/mlx5_user_ioctl_verbs.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,6 @@ enum mlx5_ib_uapi_query_port_flags {
100100
MLX5_IB_UAPI_QUERY_PORT_ESW_OWNER_VHCA_ID = 1 << 5,
101101
};
102102

103-
enum mlx5_ib_uapi_var_alloc_flags {
104-
MLX5_IB_UAPI_VAR_ALLOC_FLAG_TLP = 1 << 0,
105-
};
106-
107103
struct mlx5_ib_uapi_reg {
108104
__u32 value;
109105
__u32 mask;

kernel-headers/rdma/rdma_netlink.h

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -308,10 +308,6 @@ enum rdma_nldev_command {
308308

309309
RDMA_NLDEV_CMD_MONITOR,
310310

311-
RDMA_NLDEV_CMD_FRMR_POOLS_GET, /* can dump */
312-
313-
RDMA_NLDEV_CMD_FRMR_POOLS_SET,
314-
315311
RDMA_NLDEV_NUM_OPS
316312
};
317313

@@ -586,24 +582,6 @@ enum rdma_nldev_attr {
586582
RDMA_NLDEV_SYS_ATTR_MONITOR_MODE, /* u8 */
587583

588584
RDMA_NLDEV_ATTR_STAT_OPCOUNTER_ENABLED, /* u8 */
589-
590-
/*
591-
* FRMR Pools attributes
592-
*/
593-
RDMA_NLDEV_ATTR_FRMR_POOLS, /* nested table */
594-
RDMA_NLDEV_ATTR_FRMR_POOL_ENTRY, /* nested table */
595-
RDMA_NLDEV_ATTR_FRMR_POOL_KEY, /* nested table */
596-
RDMA_NLDEV_ATTR_FRMR_POOL_KEY_ATS, /* u8 */
597-
RDMA_NLDEV_ATTR_FRMR_POOL_KEY_ACCESS_FLAGS, /* u32 */
598-
RDMA_NLDEV_ATTR_FRMR_POOL_KEY_VENDOR_KEY, /* u64 */
599-
RDMA_NLDEV_ATTR_FRMR_POOL_KEY_NUM_DMA_BLOCKS, /* u64 */
600-
RDMA_NLDEV_ATTR_FRMR_POOL_QUEUE_HANDLES, /* u32 */
601-
RDMA_NLDEV_ATTR_FRMR_POOL_MAX_IN_USE, /* u64 */
602-
RDMA_NLDEV_ATTR_FRMR_POOL_IN_USE, /* u64 */
603-
RDMA_NLDEV_ATTR_FRMR_POOLS_AGING_PERIOD, /* u32 */
604-
RDMA_NLDEV_ATTR_FRMR_POOL_PINNED_HANDLES, /* u32 */
605-
RDMA_NLDEV_ATTR_FRMR_POOL_KEY_KERNEL_VENDOR_KEY, /* u64 */
606-
607585
/*
608586
* Always the end
609587
*/

kernel-headers/rdma/rdma_user_cm.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ struct rdma_ucm_query_path_resp {
192192

193193
struct rdma_ucm_query_ib_service_resp {
194194
__u32 num_service_recs;
195-
__u32 reserved;
196195
struct ib_user_service_rec recs[];
197196
};
198197

@@ -355,15 +354,14 @@ enum {
355354

356355
#define RDMA_USER_CM_IB_SERVICE_NAME_SIZE 64
357356
struct rdma_ucm_ib_service {
358-
__aligned_u64 service_id;
357+
__u64 service_id;
359358
__u8 service_name[RDMA_USER_CM_IB_SERVICE_NAME_SIZE];
360359
__u32 flags;
361360
__u32 reserved;
362361
};
363362

364363
struct rdma_ucm_resolve_ib_service {
365364
__u32 id;
366-
__u32 reserved;
367365
struct rdma_ucm_ib_service ibs;
368366
};
369367

0 commit comments

Comments
 (0)