Skip to content

Commit 2b7c2ba

Browse files
jakemoronirleon
authored andcommitted
RDMA/irdma: Add enum defs for reserved CQs/QPs
Added definitions for the special reserved CQs and QPs. Signed-off-by: Jacob Moroni <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Leon Romanovsky <[email protected]>
1 parent 12985e5 commit 2b7c2ba

2 files changed

Lines changed: 22 additions & 10 deletions

File tree

drivers/infiniband/hw/irdma/hw.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1532,8 +1532,8 @@ static int irdma_initialize_ilq(struct irdma_device *iwdev)
15321532
int status;
15331533

15341534
info.type = IRDMA_PUDA_RSRC_TYPE_ILQ;
1535-
info.cq_id = 1;
1536-
info.qp_id = 1;
1535+
info.cq_id = IRDMA_RSVD_CQ_ID_ILQ;
1536+
info.qp_id = IRDMA_RSVD_QP_ID_GSI_ILQ;
15371537
info.count = 1;
15381538
info.pd_id = 1;
15391539
info.abi_ver = IRDMA_ABI_VER;
@@ -1562,7 +1562,7 @@ static int irdma_initialize_ieq(struct irdma_device *iwdev)
15621562
int status;
15631563

15641564
info.type = IRDMA_PUDA_RSRC_TYPE_IEQ;
1565-
info.cq_id = 2;
1565+
info.cq_id = IRDMA_RSVD_CQ_ID_IEQ;
15661566
info.qp_id = iwdev->vsi.exception_lan_q;
15671567
info.count = 1;
15681568
info.pd_id = 2;
@@ -1868,7 +1868,7 @@ int irdma_rt_init_hw(struct irdma_device *iwdev,
18681868
vsi_info.pf_data_vsi_num = iwdev->vsi_num;
18691869
vsi_info.register_qset = rf->gen_ops.register_qset;
18701870
vsi_info.unregister_qset = rf->gen_ops.unregister_qset;
1871-
vsi_info.exception_lan_q = 2;
1871+
vsi_info.exception_lan_q = IRDMA_RSVD_QP_ID_IEQ;
18721872
irdma_sc_vsi_init(&iwdev->vsi, &vsi_info);
18731873

18741874
status = irdma_setup_cm_core(iwdev, rf->rdma_ver);
@@ -2099,18 +2099,18 @@ u32 irdma_initialize_hw_rsrc(struct irdma_pci_f *rf)
20992099
irdma_set_hw_rsrc(rf);
21002100

21012101
set_bit(0, rf->allocated_mrs);
2102-
set_bit(0, rf->allocated_qps);
2103-
set_bit(0, rf->allocated_cqs);
2102+
set_bit(IRDMA_RSVD_QP_ID_0, rf->allocated_qps);
2103+
set_bit(IRDMA_RSVD_CQ_ID_CQP, rf->allocated_cqs);
21042104
set_bit(0, rf->allocated_srqs);
21052105
set_bit(0, rf->allocated_pds);
21062106
set_bit(0, rf->allocated_arps);
21072107
set_bit(0, rf->allocated_ahs);
21082108
set_bit(0, rf->allocated_mcgs);
2109-
set_bit(2, rf->allocated_qps); /* qp 2 IEQ */
2110-
set_bit(1, rf->allocated_qps); /* qp 1 ILQ */
2111-
set_bit(1, rf->allocated_cqs);
2109+
set_bit(IRDMA_RSVD_QP_ID_IEQ, rf->allocated_qps);
2110+
set_bit(IRDMA_RSVD_QP_ID_GSI_ILQ, rf->allocated_qps);
2111+
set_bit(IRDMA_RSVD_CQ_ID_ILQ, rf->allocated_cqs);
21122112
set_bit(1, rf->allocated_pds);
2113-
set_bit(2, rf->allocated_cqs);
2113+
set_bit(IRDMA_RSVD_CQ_ID_IEQ, rf->allocated_cqs);
21142114
set_bit(2, rf->allocated_pds);
21152115

21162116
INIT_LIST_HEAD(&rf->mc_qht_list.list);

drivers/infiniband/hw/irdma/type.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,18 @@ enum irdma_queue_type {
239239
IRDMA_QUEUE_TYPE_SRQ,
240240
};
241241

242+
enum irdma_rsvd_cq_id {
243+
IRDMA_RSVD_CQ_ID_CQP,
244+
IRDMA_RSVD_CQ_ID_ILQ,
245+
IRDMA_RSVD_CQ_ID_IEQ,
246+
};
247+
248+
enum irdma_rsvd_qp_id {
249+
IRDMA_RSVD_QP_ID_0,
250+
IRDMA_RSVD_QP_ID_GSI_ILQ,
251+
IRDMA_RSVD_QP_ID_IEQ,
252+
};
253+
242254
struct irdma_sc_dev;
243255
struct irdma_vsi_pestat;
244256

0 commit comments

Comments
 (0)