Skip to content

Commit 932576e

Browse files
sbasavapatnasbasavapatna
committed
Update kernel headers
To commit: ?? ("RDMA/bnxt_re: Direct Verbs: Support CQ and QP verbs"). Signed-off-by: Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
1 parent deb50a6 commit 932576e

File tree

3 files changed

+172
-2
lines changed

3 files changed

+172
-2
lines changed

‎kernel-headers/rdma/bnxt_re-abi.h‎

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,10 @@ enum bnxt_re_objects {
162162
BNXT_RE_OBJECT_ALLOC_PAGE = (1U << UVERBS_ID_NS_SHIFT),
163163
BNXT_RE_OBJECT_NOTIFY_DRV,
164164
BNXT_RE_OBJECT_GET_TOGGLE_MEM,
165+
BNXT_RE_OBJECT_DBR,
166+
BNXT_RE_OBJECT_UMEM,
167+
BNXT_RE_OBJECT_DV_CQ,
168+
BNXT_RE_OBJECT_DV_QP,
165169
};
166170

167171
enum bnxt_re_alloc_page_type {
@@ -215,4 +219,142 @@ enum bnxt_re_toggle_mem_methods {
215219
BNXT_RE_METHOD_GET_TOGGLE_MEM = (1U << UVERBS_ID_NS_SHIFT),
216220
BNXT_RE_METHOD_RELEASE_TOGGLE_MEM,
217221
};
222+
223+
struct bnxt_re_dv_db_region {
224+
__u32 dbr_handle;
225+
__u32 dpi;
226+
__u64 umdbr;
227+
void *dbr;
228+
__aligned_u64 comp_mask;
229+
};
230+
231+
enum bnxt_re_obj_dbr_alloc_attrs {
232+
BNXT_RE_DV_ALLOC_DBR_HANDLE = (1U << UVERBS_ID_NS_SHIFT),
233+
BNXT_RE_DV_ALLOC_DBR_ATTR,
234+
BNXT_RE_DV_ALLOC_DBR_OFFSET,
235+
};
236+
237+
enum bnxt_re_obj_dbr_free_attrs {
238+
BNXT_RE_DV_FREE_DBR_HANDLE = (1U << UVERBS_ID_NS_SHIFT),
239+
};
240+
241+
enum bnxt_re_obj_dbr_query_attrs {
242+
BNXT_RE_DV_QUERY_DBR_ATTR = (1U << UVERBS_ID_NS_SHIFT),
243+
};
244+
245+
enum bnxt_re_obj_dpi_methods {
246+
BNXT_RE_METHOD_DBR_ALLOC = (1U << UVERBS_ID_NS_SHIFT),
247+
BNXT_RE_METHOD_DBR_FREE,
248+
BNXT_RE_METHOD_DBR_QUERY,
249+
};
250+
251+
enum bnxt_re_dv_umem_reg_attrs {
252+
BNXT_RE_UMEM_OBJ_REG_HANDLE = (1U << UVERBS_ID_NS_SHIFT),
253+
BNXT_RE_UMEM_OBJ_REG_ADDR,
254+
BNXT_RE_UMEM_OBJ_REG_LEN,
255+
BNXT_RE_UMEM_OBJ_REG_ACCESS,
256+
BNXT_RE_UMEM_OBJ_REG_DMABUF_FD,
257+
BNXT_RE_UMEM_OBJ_REG_PGSZ_BITMAP,
258+
};
259+
260+
enum bnxt_re_dv_umem_dereg_attrs {
261+
BNXT_RE_UMEM_OBJ_DEREG_HANDLE = (1U << UVERBS_ID_NS_SHIFT),
262+
};
263+
264+
enum bnxt_re_dv_umem_methods {
265+
BNXT_RE_METHOD_UMEM_REG = (1U << UVERBS_ID_NS_SHIFT),
266+
BNXT_RE_METHOD_UMEM_DEREG,
267+
};
268+
269+
struct bnxt_re_dv_cq_req {
270+
__u32 ncqe;
271+
__aligned_u64 va;
272+
__aligned_u64 comp_mask;
273+
};
274+
275+
struct bnxt_re_dv_cq_resp {
276+
__u32 cqid;
277+
__u32 tail;
278+
__u32 phase;
279+
__u32 rsvd;
280+
__aligned_u64 comp_mask;
281+
};
282+
283+
enum bnxt_re_dv_create_cq_attrs {
284+
BNXT_RE_DV_CREATE_CQ_HANDLE = (1U << UVERBS_ID_NS_SHIFT),
285+
BNXT_RE_DV_CREATE_CQ_REQ,
286+
BNXT_RE_DV_CREATE_CQ_UMEM_HANDLE,
287+
BNXT_RE_DV_CREATE_CQ_UMEM_OFFSET,
288+
BNXT_RE_DV_CREATE_CQ_RESP,
289+
};
290+
291+
enum bnxt_re_dv_cq_methods {
292+
BNXT_RE_METHOD_DV_CREATE_CQ = (1U << UVERBS_ID_NS_SHIFT),
293+
BNXT_RE_METHOD_DV_DESTROY_CQ,
294+
};
295+
296+
enum bnxt_re_dv_destroy_cq_attrs {
297+
BNXT_RE_DV_DESTROY_CQ_HANDLE = (1U << UVERBS_ID_NS_SHIFT),
298+
};
299+
300+
struct bnxt_re_dv_create_qp_req {
301+
int qp_type;
302+
__u32 max_send_wr;
303+
__u32 max_recv_wr;
304+
__u32 max_send_sge;
305+
__u32 max_recv_sge;
306+
__u32 max_inline_data;
307+
__u32 pd_id;
308+
__aligned_u64 qp_handle;
309+
__aligned_u64 sq_va;
310+
__u32 sq_umem_offset;
311+
__u32 sq_len; /* total len including MSN area */
312+
__u32 sq_slots;
313+
__u32 sq_wqe_sz;
314+
__u32 sq_psn_sz;
315+
__u32 sq_npsn;
316+
__aligned_u64 rq_va;
317+
__u32 rq_umem_offset;
318+
__u32 rq_len;
319+
__u32 rq_slots; /* == max_recv_wr */
320+
__u32 rq_wqe_sz;
321+
};
322+
323+
struct bnxt_re_dv_create_qp_resp {
324+
__u32 qpid;
325+
};
326+
327+
enum bnxt_re_dv_create_qp_attrs {
328+
BNXT_RE_DV_CREATE_QP_HANDLE = (1U << UVERBS_ID_NS_SHIFT),
329+
BNXT_RE_DV_CREATE_QP_REQ,
330+
BNXT_RE_DV_CREATE_QP_SEND_CQ_HANDLE,
331+
BNXT_RE_DV_CREATE_QP_RECV_CQ_HANDLE,
332+
BNXT_RE_DV_CREATE_QP_SQ_UMEM_HANDLE,
333+
BNXT_RE_DV_CREATE_QP_RQ_UMEM_HANDLE,
334+
BNXT_RE_DV_CREATE_QP_SRQ_HANDLE,
335+
BNXT_RE_DV_CREATE_QP_DBR_HANDLE,
336+
BNXT_RE_DV_CREATE_QP_RESP
337+
};
338+
339+
enum bnxt_re_dv_qp_methods {
340+
BNXT_RE_METHOD_DV_CREATE_QP = (1U << UVERBS_ID_NS_SHIFT),
341+
BNXT_RE_METHOD_DV_DESTROY_QP,
342+
BNXT_RE_METHOD_DV_MODIFY_QP,
343+
BNXT_RE_METHOD_DV_QUERY_QP,
344+
};
345+
346+
enum bnxt_re_dv_destroy_qp_attrs {
347+
BNXT_RE_DV_DESTROY_QP_HANDLE = (1U << UVERBS_ID_NS_SHIFT),
348+
};
349+
350+
enum bnxt_re_var_dv_modify_qp_attrs {
351+
BNXT_RE_DV_MODIFY_QP_HANDLE = (1U << UVERBS_ID_NS_SHIFT),
352+
BNXT_RE_DV_MODIFY_QP_REQ,
353+
};
354+
355+
enum bnxt_re_dv_query_qp_attrs {
356+
BNXT_RE_DV_QUERY_QP_HANDLE = (1U << UVERBS_ID_NS_SHIFT),
357+
BNXT_RE_DV_QUERY_QP_ATTR,
358+
};
359+
218360
#endif /* __BNXT_RE_UVERBS_ABI_H__*/

‎kernel-headers/rdma/irdma-abi.h‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,14 @@ enum irdma_memreg_type {
2020
IRDMA_MEMREG_TYPE_MEM = 0,
2121
IRDMA_MEMREG_TYPE_QP = 1,
2222
IRDMA_MEMREG_TYPE_CQ = 2,
23+
IRDMA_MEMREG_TYPE_SRQ = 3,
2324
};
2425

2526
enum {
2627
IRDMA_ALLOC_UCTX_USE_RAW_ATTR = 1 << 0,
2728
IRDMA_ALLOC_UCTX_MIN_HW_WQ_SIZE = 1 << 1,
29+
IRDMA_ALLOC_UCTX_MAX_HW_SRQ_QUANTA = 1 << 2,
30+
IRDMA_SUPPORT_WQE_FORMAT_V2 = 1 << 3,
2831
};
2932

3033
struct irdma_alloc_ucontext_req {
@@ -54,7 +57,8 @@ struct irdma_alloc_ucontext_resp {
5457
__u8 rsvd2;
5558
__aligned_u64 comp_mask;
5659
__u16 min_hw_wq_size;
57-
__u8 rsvd3[6];
60+
__u32 max_hw_srq_quanta;
61+
__u8 rsvd3[2];
5862
};
5963

6064
struct irdma_alloc_pd_resp {
@@ -71,6 +75,16 @@ struct irdma_create_cq_req {
7175
__aligned_u64 user_shadow_area;
7276
};
7377

78+
struct irdma_create_srq_req {
79+
__aligned_u64 user_srq_buf;
80+
__aligned_u64 user_shadow_area;
81+
};
82+
83+
struct irdma_create_srq_resp {
84+
__u32 srq_id;
85+
__u32 srq_size;
86+
};
87+
7488
struct irdma_create_qp_req {
7589
__aligned_u64 user_wqe_bufs;
7690
__aligned_u64 user_compl_ctx;

‎kernel-headers/rdma/rdma_user_cm.h‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ enum {
6868
RDMA_USER_CM_CMD_BIND,
6969
RDMA_USER_CM_CMD_RESOLVE_ADDR,
7070
RDMA_USER_CM_CMD_JOIN_MCAST,
71-
RDMA_USER_CM_CMD_RESOLVE_IB_SERVICE
71+
RDMA_USER_CM_CMD_RESOLVE_IB_SERVICE,
72+
RDMA_USER_CM_CMD_WRITE_CM_EVENT,
7273
};
7374

7475
/* See IBTA Annex A11, servies ID bytes 4 & 5 */
@@ -304,6 +305,7 @@ struct rdma_ucm_event_resp {
304305
union {
305306
struct rdma_ucm_conn_param conn;
306307
struct rdma_ucm_ud_param ud;
308+
__u32 arg32[2];
307309
} param;
308310
__u32 reserved;
309311
struct rdma_ucm_ece ece;
@@ -362,4 +364,16 @@ struct rdma_ucm_resolve_ib_service {
362364
__u32 id;
363365
struct rdma_ucm_ib_service ibs;
364366
};
367+
368+
struct rdma_ucm_write_cm_event {
369+
__u32 id;
370+
__u32 reserved;
371+
__u32 event;
372+
__u32 status;
373+
union {
374+
struct rdma_ucm_conn_param conn;
375+
struct rdma_ucm_ud_param ud;
376+
__u64 arg;
377+
} param;
378+
};
365379
#endif /* RDMA_USER_CM_H */

0 commit comments

Comments
 (0)