RDMA/bnxt_re: Initial support for GenP7 adapters
Subsystems (2)
Selvin Xavier
maintainercover RDMA/bnxt_re: Initial support for GenP7 adapters
This is the first series for adding support for Gen P7 Adapters. Includes the basic changes to detect the device and load. Adds the Doorbell changes for the new adapter and MSN capability to enable the FW initialization of the adapter.
Please review and apply.
Thanks,
Selvin Xavier
Selvin Xavier (6):
RDMA/bnxt_re: Support new 5760X P7 devices RDMA/bnxt_re: Update the BAR offsets RDMA/bnxt_re: Update the HW interface definitions RDMA/bnxt_re: Get the toggle bits from CQ completions RDMA/bnxt_re: Doorbell changes
RDMA/bnxt_re: Adds MSN table capability for Gen P7 adapters
drivers/infiniband/hw/bnxt_re/hw_counters.c | 4 +- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 10 ++-- drivers/infiniband/hw/bnxt_re/main.c | 33 +++++-------- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 77 ++++++++++++++++++++++++++--- drivers/infiniband/hw/bnxt_re/qplib_fp.h | 15 ++++++ drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 4 +- drivers/infiniband/hw/bnxt_re/qplib_res.c | 2 +- drivers/infiniband/hw/bnxt_re/qplib_res.h | 76 ++++++++++++++++++++++------ drivers/infiniband/hw/bnxt_re/qplib_sp.c | 11 +++-- drivers/infiniband/hw/bnxt_re/roce_hsi.h | 67 +++++++++++++++++++++---- include/uapi/rdma/bnxt_re-abi.h | 1 + 11 files changed, 234 insertions(+), 66 deletions(-)
Signature · 1 line
2.5.5
Selvin Xavier
maintainerPATCH 1/6 RDMA/bnxt_re: Support new 5760X P7 devices
Add basic support for 5760X P7 devices. Add new chip revisions. The first version support is similar to the existing P5 adapters. Extend the current support for P5 adapters to P7 also.
--- drivers/infiniband/hw/bnxt_re/hw_counters.c | 4 ++-- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 10 +++++----- drivers/infiniband/hw/bnxt_re/main.c | 14 +++++++------- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 4 ++-- drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 2 +- drivers/infiniband/hw/bnxt_re/qplib_res.c | 2 +- drivers/infiniband/hw/bnxt_re/qplib_res.h | 20 +++++++++++++++++--- drivers/infiniband/hw/bnxt_re/qplib_sp.c | 6 +++--- 8 files changed, 38 insertions(+), 24 deletions(-)
drivers/infiniband/hw/bnxt_re/hw_counters.c +2 -2
@@ -371,7 +371,7 @@ int bnxt_re_ib_get_hw_stats(struct ib_device *ibdev, } done: -return bnxt_qplib_is_chip_gen_p5 (rdev->chip_ctx) ? +return bnxt_qplib_is_chip_gen_p5_p7 (rdev->chip_ctx) ?BNXT_RE_NUM_EXT_COUNTERS :BNXT_RE_NUM_STD_COUNTERS ; }
@@ -381,7 +381,7 @@ struct rdma_hw_stats *bnxt_re_ib_alloc_hw_port_stats(struct ib_device *ibdev,struct bnxt_re_dev *rdev =to_bnxt_re_dev (ibdev, ibdev);int num_counters =0 ; -if (bnxt_qplib_is_chip_gen_p5 (rdev->chip_ctx)) +if (bnxt_qplib_is_chip_gen_p5_p7 (rdev->chip_ctx)) num_counters =BNXT_RE_NUM_EXT_COUNTERS ;else num_counters =BNXT_RE_NUM_STD_COUNTERS ;
drivers/infiniband/hw/bnxt_re/ib_verbs.c +5 -5
@@ -1023,7 +1023,7 @@ static int bnxt_re_init_user_qp(struct bnxt_re_dev *rdev, struct bnxt_re_pd *pd, bytes = (qplib_qp->sq.max_wqe * qplib_qp->sq.wqe_size);/* Consider mapping PSN search memory only for RC QPs. */ if (qplib_qp->type ==CMDQ_CREATE_QP_TYPE_RC ) { - psn_sz =bnxt_qplib_is_chip_gen_p5 (rdev->chip_ctx) ? + psn_sz =bnxt_qplib_is_chip_gen_p5_p7 (rdev->chip_ctx) ?sizeof (struct sq_psn_search_ext ) :sizeof (struct sq_psn_search ); psn_nume = (qplib_qp->wqe_mode == BNXT_QPLIB_WQE_MODE_STATIC) ?
@@ -1234,7 +1234,7 @@ static void bnxt_re_adjust_gsi_rq_attr(struct bnxt_re_qp *qp) qplqp = &qp->qplib_qp; dev_attr = &rdev->dev_attr; -if (!bnxt_qplib_is_chip_gen_p5 (rdev->chip_ctx)) { +if (!bnxt_qplib_is_chip_gen_p5_p7 (rdev->chip_ctx)) { qplqp->rq.max_sge = dev_attr->max_qp_sges;if (qplqp->rq.max_sge > dev_attr->max_qp_sges) qplqp->rq.max_sge = dev_attr->max_qp_sges;
@@ -1301,7 +1301,7 @@ static void bnxt_re_adjust_gsi_sq_attr(struct bnxt_re_qp *qp, qplqp = &qp->qplib_qp; dev_attr = &rdev->dev_attr; -if (!bnxt_qplib_is_chip_gen_p5 (rdev->chip_ctx)) { +if (!bnxt_qplib_is_chip_gen_p5_p7 (rdev->chip_ctx)) { entries =bnxt_re_init_depth (init_attr->cap.max_send_wr +1 , uctx); qplqp->sq.max_wqe =min_t (u32, entries, dev_attr->max_qp_wqes +1 );
@@ -1328,7 +1328,7 @@ static int bnxt_re_init_qp_type(struct bnxt_re_dev *rdev, goto out; } -if (bnxt_qplib_is_chip_gen_p5 (chip_ctx) && +if (bnxt_qplib_is_chip_gen_p5_p7 (chip_ctx) && init_attr->qp_type ==IB_QPT_GSI ) qptype =CMDQ_CREATE_QP_TYPE_GSI ; out:
@@ -1527,7 +1527,7 @@ int bnxt_re_create_qp(struct ib_qp *ib_qp, struct ib_qp_init_attr *qp_init_attr, goto fail;if (qp_init_attr->qp_type ==IB_QPT_GSI && - !(bnxt_qplib_is_chip_gen_p5 (rdev->chip_ctx))) { + !(bnxt_qplib_is_chip_gen_p5_p7 (rdev->chip_ctx))) { rc =bnxt_re_create_gsi_qp (qp, pd, qp_init_attr);if (rc == -ENODEV ) goto qp_destroy;
drivers/infiniband/hw/bnxt_re/main.c +7 -7
@@ -128,7 +128,7 @@ static void bnxt_re_set_drv_mode(struct bnxt_re_dev *rdev, u8 mode)struct bnxt_qplib_chip_ctx *cctx; cctx = rdev->chip_ctx; - cctx->modes.wqe_mode =bnxt_qplib_is_chip_gen_p5 (rdev->chip_ctx) ? + cctx->modes.wqe_mode =bnxt_qplib_is_chip_gen_p5_p7 (rdev->chip_ctx) ? mode :BNXT_QPLIB_WQE_MODE_STATIC ;if (bnxt_re_hwrm_qcaps (rdev)) dev_err(rdev_to_dev(rdev),
@@ -215,7 +215,7 @@ static void bnxt_re_limit_pf_res(struct bnxt_re_dev *rdev) ctx->srqc_count =min_t (u32,BNXT_RE_MAX_SRQC_COUNT , attr->max_srq); ctx->cq_count =min_t (u32,BNXT_RE_MAX_CQ_COUNT , attr->max_cq); -if (!bnxt_qplib_is_chip_gen_p5 (rdev->chip_ctx)) +if (!bnxt_qplib_is_chip_gen_p5_p7 (rdev->chip_ctx))for (i =0 ; i <MAX_TQM_ALLOC_REQ ; i++) rdev->qplib_ctx.tqm_ctx.qcount[i] = rdev->dev_attr.tqm_alloc_reqs[i];
@@ -264,7 +264,7 @@ static void bnxt_re_set_resource_limits(struct bnxt_re_dev *rdev)memset (&rdev->qplib_ctx.vf_res,0 ,sizeof (struct bnxt_qplib_vf_res ));bnxt_re_limit_pf_res (rdev); - num_vfs =bnxt_qplib_is_chip_gen_p5 (rdev->chip_ctx) ? + num_vfs =bnxt_qplib_is_chip_gen_p5_p7 (rdev->chip_ctx) ?BNXT_RE_GEN_P5_MAX_VF : rdev->num_vfs;if (num_vfs)bnxt_re_limit_vf_res (&rdev->qplib_ctx, num_vfs);
@@ -276,7 +276,7 @@ static void bnxt_re_vf_res_config(struct bnxt_re_dev *rdev)if (test_bit (BNXT_RE_FLAG_ERR_DEVICE_DETACHED , &rdev->flags))return ; rdev->num_vfs =pci_sriov_get_totalvfs (rdev->en_dev->pdev); -if (!bnxt_qplib_is_chip_gen_p5 (rdev->chip_ctx)) { +if (!bnxt_qplib_is_chip_gen_p5_p7 (rdev->chip_ctx)) {bnxt_re_set_resource_limits (rdev);bnxt_qplib_set_func_resources (&rdev->qplib_res, &rdev->rcfw, &rdev->qplib_ctx);
@@ -1216,7 +1216,7 @@ static int bnxt_re_cqn_handler(struct bnxt_qplib_nq *nq,#define BNXT_RE_GEN_P5_VF_NQ_DB 0x4000static u32 bnxt_re_get_nqdb_offset (struct bnxt_re_dev *rdev,u16 indx) { -return bnxt_qplib_is_chip_gen_p5 (rdev->chip_ctx) ? +return bnxt_qplib_is_chip_gen_p5_p7 (rdev->chip_ctx) ? (rdev->is_virtfn ?BNXT_RE_GEN_P5_VF_NQ_DB :BNXT_RE_GEN_P5_PF_NQ_DB ) : rdev->en_dev->msix_entries[indx].db_offset;
@@ -1681,7 +1681,7 @@ static int bnxt_re_dev_init(struct bnxt_re_dev *rdev, u8 wqe_mode)bnxt_re_set_resource_limits (rdev); rc =bnxt_qplib_alloc_ctx (&rdev->qplib_res, &rdev->qplib_ctx,0 , -bnxt_qplib_is_chip_gen_p5 (rdev->chip_ctx)); +bnxt_qplib_is_chip_gen_p5_p7 (rdev->chip_ctx));if (rc) {ibdev_err (&rdev->ibdev,"Failed to allocate QPLIB context: %#x\n" , rc);
@@ -1804,7 +1804,7 @@ static void bnxt_re_setup_cc(struct bnxt_re_dev *rdev, bool enable)return ;/* Currently enabling only for GenP5 adapters */ -if (!bnxt_qplib_is_chip_gen_p5 (rdev->chip_ctx)) +if (!bnxt_qplib_is_chip_gen_p5_p7 (rdev->chip_ctx))return ;if (enable) {
drivers/infiniband/hw/bnxt_re/qplib_fp.c +2 -2
@@ -991,7 +991,7 @@ int bnxt_qplib_create_qp(struct bnxt_qplib_res *res, struct bnxt_qplib_qp *qp)/* SQ */ if (qp->type ==CMDQ_CREATE_QP_TYPE_RC ) { - psn_sz =bnxt_qplib_is_chip_gen_p5 (res->cctx) ? + psn_sz =bnxt_qplib_is_chip_gen_p5_p7 (res->cctx) ?sizeof (struct sq_psn_search_ext ) :sizeof (struct sq_psn_search ); }
@@ -1605,7 +1605,7 @@ static void bnxt_qplib_fill_psn_search(struct bnxt_qplib_qp *qp, flg_npsn = ((swq->next_psn <<SQ_PSN_SEARCH_NEXT_PSN_SFT ) &SQ_PSN_SEARCH_NEXT_PSN_MASK ); -if (bnxt_qplib_is_chip_gen_p5 (qp->cctx)) { +if (bnxt_qplib_is_chip_gen_p5_p7 (qp->cctx)) { psns_ext->opcode_start_psn =cpu_to_le32 (op_spsn); psns_ext->flags_next_psn =cpu_to_le32 (flg_npsn); psns_ext->start_slot_idx =cpu_to_le16 (swq->slot_idx);
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +1 -1
@@ -852,7 +852,7 @@ int bnxt_qplib_init_rcfw(struct bnxt_qplib_rcfw *rcfw,*/ if (is_virtfn) goto skip_ctx_setup; -if (bnxt_qplib_is_chip_gen_p5 (rcfw->res->cctx)) +if (bnxt_qplib_is_chip_gen_p5_p7 (rcfw->res->cctx)) goto config_vf_res; lvl = ctx->qpc_tbl.level;
drivers/infiniband/hw/bnxt_re/qplib_res.c +1 -1
@@ -805,7 +805,7 @@ static int bnxt_qplib_alloc_dpi_tbl(struct bnxt_qplib_res *res, dpit = &res->dpi_tbl; reg = &dpit->wcreg; -if (!bnxt_qplib_is_chip_gen_p5 (res->cctx)) { +if (!bnxt_qplib_is_chip_gen_p5_p7 (res->cctx)) {/* Offest should come from L2 driver */ dbr_offset = dev_attr->l2_db_size; dpit->ucreg.offset = dbr_offset;
drivers/infiniband/hw/bnxt_re/qplib_res.h +17 -3
@@ -44,6 +44,9 @@ extern const struct bnxt_qplib_gid bnxt_qplib_gid_zero;#define CHIP_NUM_57508 0x1750#define CHIP_NUM_57504 0x1751#define CHIP_NUM_57502 0x1752 +#define CHIP_NUM_58818 0xd818 +#define CHIP_NUM_57608 0x1760 +struct bnxt_qplib_drv_modes {u8 wqe_mode;
@@ -296,6 +299,12 @@ struct bnxt_qplib_res {struct bnxt_qplib_db_pacing_data *pacing_data; }; +static inline bool bnxt_qplib_is_chip_gen_p7 (struct bnxt_qplib_chip_ctx *cctx) +{ +return (cctx->chip_num ==CHIP_NUM_58818 || + cctx->chip_num ==CHIP_NUM_57608 ); +} +static inline bool bnxt_qplib_is_chip_gen_p5 (struct bnxt_qplib_chip_ctx *cctx) { return (cctx->chip_num == CHIP_NUM_57508 ||
@@ -303,15 +312,20 @@ static inline bool bnxt_qplib_is_chip_gen_p5(struct bnxt_qplib_chip_ctx *cctx) cctx->chip_num == CHIP_NUM_57502); } +static inline bool bnxt_qplib_is_chip_gen_p5_p7 (struct bnxt_qplib_chip_ctx *cctx) +{ +return bnxt_qplib_is_chip_gen_p5 (cctx) ||bnxt_qplib_is_chip_gen_p7 (cctx); +} +static inline u8 bnxt_qplib_get_hwq_type (struct bnxt_qplib_res *res) { -return bnxt_qplib_is_chip_gen_p5 (res->cctx) ? +return bnxt_qplib_is_chip_gen_p5_p7 (res->cctx) ?HWQ_TYPE_QUEUE :HWQ_TYPE_L2_CMPL ; }static inline u8 bnxt_qplib_get_ring_type (struct bnxt_qplib_chip_ctx *cctx) { -return bnxt_qplib_is_chip_gen_p5 (cctx) ? +return bnxt_qplib_is_chip_gen_p5_p7 (cctx) ?RING_ALLOC_REQ_RING_TYPE_NQ :RING_ALLOC_REQ_RING_TYPE_ROCE_CMPL ; }
@@ -488,7 +502,7 @@ static inline void bnxt_qplib_ring_nq_db(struct bnxt_qplib_db_info *info,u32 type; type = arm ?DBC_DBC_TYPE_NQ_ARM :DBC_DBC_TYPE_NQ ; -if (bnxt_qplib_is_chip_gen_p5 (cctx)) +if (bnxt_qplib_is_chip_gen_p5_p7 (cctx))bnxt_qplib_ring_db (info, type);else bnxt_qplib_ring_db32 (info, arm);
drivers/infiniband/hw/bnxt_re/qplib_sp.c +3 -3
@@ -59,7 +59,7 @@ static bool bnxt_qplib_is_atomic_cap(struct bnxt_qplib_rcfw *rcfw) {u16 pcie_ctl2 =0 ; -if (!bnxt_qplib_is_chip_gen_p5 (rcfw->res->cctx)) +if (!bnxt_qplib_is_chip_gen_p5_p7 (rcfw->res->cctx))return false;pcie_capability_read_word (rcfw->pdev,PCI_EXP_DEVCTL2 , &pcie_ctl2);
@@ -133,7 +133,7 @@ int bnxt_qplib_get_dev_attr(struct bnxt_qplib_rcfw *rcfw,* reporting the max number */ attr->max_qp_wqes -=BNXT_QPLIB_RESERVED_QP_WRS +1 ; - attr->max_qp_sges =bnxt_qplib_is_chip_gen_p5 (rcfw->res->cctx) ? + attr->max_qp_sges =bnxt_qplib_is_chip_gen_p5_p7 (rcfw->res->cctx) ?6 : sb->max_sge; attr->max_cq =le32_to_cpu (sb->max_cq); attr->max_cq_wqes =le32_to_cpu (sb->max_cqe);
@@ -934,7 +934,7 @@ int bnxt_qplib_modify_cc(struct bnxt_qplib_res *res, req->inactivity_th =cpu_to_le16 (cc_param->inact_th);/* For chip gen P5 onwards fill extended cmd and header */ -if (bnxt_qplib_is_chip_gen_p5 (res->cctx)) { +if (bnxt_qplib_is_chip_gen_p5_p7 (res->cctx)) {struct roce_tlv *hdr;u32 payload;u32 chunks;
Signature · 1 line
2.5.5
Selvin Xavier
maintainerPATCH 2/6 RDMA/bnxt_re: Update the BAR offsets
In reply to Selvin XavierUpdate the BAR offsets for handling GenP7 adapters. Use the values populated by L2 driver for getting the Doorbell offsets.
--- drivers/infiniband/hw/bnxt_re/main.c | 21 +++++++-------------- drivers/infiniband/hw/bnxt_re/qplib_sp.c | 5 +++-- 2 files changed, 10 insertions(+), 16 deletions(-)
drivers/infiniband/hw/bnxt_re/main.c +7 -14
@@ -107,8 +107,11 @@ static void bnxt_re_set_db_offset(struct bnxt_re_dev *rdev)dev_info (rdev_to_dev (rdev),"Couldn't get DB bar size, Low latency framework is disabled\n" );/* set register offsets for both UC and WC */ - res->dpi_tbl.ucreg.offset = res->is_vf ?BNXT_QPLIB_DBR_VF_DB_OFFSET : -BNXT_QPLIB_DBR_PF_DB_OFFSET ; +if (bnxt_qplib_is_chip_gen_p7 (cctx)) + res->dpi_tbl.ucreg.offset = offset; +else + res->dpi_tbl.ucreg.offset = res->is_vf ?BNXT_QPLIB_DBR_VF_DB_OFFSET : +BNXT_QPLIB_DBR_PF_DB_OFFSET ; res->dpi_tbl.wcreg.offset = res->dpi_tbl.ucreg.offset;/* If WC mapping is disabled by L2 driver then en_dev->l2_db_size
@@ -1212,16 +1215,6 @@ static int bnxt_re_cqn_handler(struct bnxt_qplib_nq *nq,return 0 ; } -#define BNXT_RE_GEN_P5_PF_NQ_DB 0x10000 -#define BNXT_RE_GEN_P5_VF_NQ_DB 0x4000 -static u32 bnxt_re_get_nqdb_offset (struct bnxt_re_dev *rdev,u16 indx) -{ -return bnxt_qplib_is_chip_gen_p5_p7 (rdev->chip_ctx) ? - (rdev->is_virtfn ?BNXT_RE_GEN_P5_VF_NQ_DB : -BNXT_RE_GEN_P5_PF_NQ_DB ) : - rdev->en_dev->msix_entries[indx].db_offset; -} -static void bnxt_re_cleanup_res (struct bnxt_re_dev *rdev) {int i;
@@ -1242,7 +1235,7 @@ static int bnxt_re_init_res(struct bnxt_re_dev *rdev)bnxt_qplib_init_res (&rdev->qplib_res);for (i =1 ; i < rdev->num_msix ; i++) { - db_offt =bnxt_re_get_nqdb_offset (rdev, i); + db_offt = rdev->en_dev->msix_entries[i].db_offset; rc = bnxt_qplib_enable_nq(rdev->en_dev->pdev, &rdev->nq[i - 1], i - 1, rdev->en_dev->msix_entries[i].vector, db_offt, &bnxt_re_cqn_handler,
@@ -1653,7 +1646,7 @@ static int bnxt_re_dev_init(struct bnxt_re_dev *rdev, u8 wqe_mode)ibdev_err (&rdev->ibdev,"Failed to allocate CREQ: %#x\n" , rc); goto free_rcfw; } - db_offt =bnxt_re_get_nqdb_offset (rdev,BNXT_RE_AEQ_IDX ); + db_offt = rdev->en_dev->msix_entries[BNXT_RE_AEQ_IDX ].db_offset; vid = rdev->en_dev->msix_entries[BNXT_RE_AEQ_IDX ].vector; rc = bnxt_qplib_enable_rcfw_channel(&rdev->rcfw, vid, db_offt,
drivers/infiniband/hw/bnxt_re/qplib_sp.c +3 -2
@@ -151,8 +151,9 @@ int bnxt_qplib_get_dev_attr(struct bnxt_qplib_rcfw *rcfw, attr->max_srq_sges = sb->max_srq_sge; attr->max_pkey =1 ; attr->max_inline_data =le32_to_cpu (sb->max_inline_data); - attr->l2_db_size = (sb->l2_db_space_size +1 ) * - (0x01 <<RCFW_DBR_BASE_PAGE_SHIFT ); +if (!bnxt_qplib_is_chip_gen_p7 (rcfw->res->cctx)) + attr->l2_db_size = (sb->l2_db_space_size +1 ) * + (0x01 <<RCFW_DBR_BASE_PAGE_SHIFT ); attr->max_sgid =BNXT_QPLIB_NUM_GIDS_SUPPORTED ; attr->dev_cap_flags =le16_to_cpu (sb->dev_cap_flags);
Signature · 1 line
2.5.5
Selvin Xavier
maintainerPATCH 3/6 RDMA/bnxt_re: Update the HW interface definitions
In reply to Selvin XavierAdds HW interface definitions to support the new
chip revision.
--- drivers/infiniband/hw/bnxt_re/roce_hsi.h | 67 +++++++++++++++++++++++++++----- 1 file changed, 57 insertions(+), 10 deletions(-)
drivers/infiniband/hw/bnxt_re/roce_hsi.h +57 -10
@@ -555,7 +555,12 @@ struct cmdq_modify_qp {__le16 flags;__le16 cookie;u8 resp_size; -u8 reserved8; +u8 qp_type; +#define CMDQ_MODIFY_QP_QP_TYPE_RC 0x2UL +#define CMDQ_MODIFY_QP_QP_TYPE_UD 0x4UL +#define CMDQ_MODIFY_QP_QP_TYPE_RAW_ETHERTYPE 0x6UL +#define CMDQ_MODIFY_QP_QP_TYPE_GSI 0x7UL +#define CMDQ_MODIFY_QP_QP_TYPE_LAST CMDQ_MODIFY_QP_QP_TYPE_GSI__le64 resp_addr;__le32 modify_mask;#define CMDQ_MODIFY_QP_MODIFY_MASK_STATE 0x1UL
@@ -611,14 +616,12 @@ struct cmdq_modify_qp {#define CMDQ_MODIFY_QP_NETWORK_TYPE_ROCEV2_IPV6 (0x3UL << 6)#define CMDQ_MODIFY_QP_NETWORK_TYPE_LAST CMDQ_MODIFY_QP_NETWORK_TYPE_ROCEV2_IPV6u8 access; -#define CMDQ_MODIFY_QP_ACCESS_REMOTE_ATOMIC_REMOTE_READ_REMOTE_WRITE_LOCAL_WRITE_MASK \ - 0xffUL -#define CMDQ_MODIFY_QP_ACCESS_REMOTE_ATOMIC_REMOTE_READ_REMOTE_WRITE_LOCAL_WRITE_SFT \ - 0 -#define CMDQ_MODIFY_QP_ACCESS_LOCAL_WRITE 0x1UL -#define CMDQ_MODIFY_QP_ACCESS_REMOTE_WRITE 0x2UL -#define CMDQ_MODIFY_QP_ACCESS_REMOTE_READ 0x4UL -#define CMDQ_MODIFY_QP_ACCESS_REMOTE_ATOMIC 0x8UL +#define CMDQ_MODIFY_QP_ACCESS_REMOTE_ATOMIC_REMOTE_READ_REMOTE_WRITE_LOCAL_WRITE_MASK 0xffUL +#define CMDQ_MODIFY_QP_ACCESS_REMOTE_ATOMIC_REMOTE_READ_REMOTE_WRITE_LOCAL_WRITE_SFT 0 +#define CMDQ_MODIFY_QP_ACCESS_LOCAL_WRITE 0x1UL +#define CMDQ_MODIFY_QP_ACCESS_REMOTE_WRITE 0x2UL +#define CMDQ_MODIFY_QP_ACCESS_REMOTE_READ 0x4UL +#define CMDQ_MODIFY_QP_ACCESS_REMOTE_ATOMIC 0x8UL__le16 pkey;__le32 qkey;__le32 dgid[4 ];
@@ -673,6 +676,13 @@ struct cmdq_modify_qp {#define CMDQ_MODIFY_QP_VLAN_PCP_SFT 13__le64 irrq_addr;__le64 orrq_addr; +__le32 ext_modify_mask; +#define CMDQ_MODIFY_QP_EXT_MODIFY_MASK_EXT_STATS_CTX 0x1UL +#define CMDQ_MODIFY_QP_EXT_MODIFY_MASK_SCHQ_ID_VALID 0x2UL +__le32 ext_stats_ctx_id; +__le16 schq_id; +__le16 unused_0; +__le32 reserved32; };/* creq_modify_qp_resp (size:128b/16B) */
@@ -3075,6 +3085,17 @@ struct sq_psn_search_ext {__le32 reserved32; }; +/* sq_msn_search (size:64b/8B) */ +struct sq_msn_search { +__le64 start_idx_next_psn_start_psn; +#define SQ_MSN_SEARCH_START_PSN_MASK 0xffffffUL +#define SQ_MSN_SEARCH_START_PSN_SFT 0 +#define SQ_MSN_SEARCH_NEXT_PSN_MASK 0xffffff000000ULL +#define SQ_MSN_SEARCH_NEXT_PSN_SFT 24 +#define SQ_MSN_SEARCH_START_IDX_MASK 0xffff000000000000ULL +#define SQ_MSN_SEARCH_START_IDX_SFT 48 +}; +/* sq_send (size:1024b/128B) */ struct sq_send {u8 wqe_type;
@@ -3763,13 +3784,35 @@ struct cq_base {#define CQ_BASE_CQE_TYPE_RES_UD (0x2UL << 1)#define CQ_BASE_CQE_TYPE_RES_RAWETH_QP1 (0x3UL << 1)#define CQ_BASE_CQE_TYPE_RES_UD_CFA (0x4UL << 1) +#define CQ_BASE_CQE_TYPE_REQ_V3 (0x8UL << 1) +#define CQ_BASE_CQE_TYPE_RES_RC_V3 (0x9UL << 1) +#define CQ_BASE_CQE_TYPE_RES_UD_V3 (0xaUL << 1) +#define CQ_BASE_CQE_TYPE_RES_RAWETH_QP1_V3 (0xbUL << 1) +#define CQ_BASE_CQE_TYPE_RES_UD_CFA_V3 (0xcUL << 1)#define CQ_BASE_CQE_TYPE_NO_OP (0xdUL << 1)#define CQ_BASE_CQE_TYPE_TERMINAL (0xeUL << 1)#define CQ_BASE_CQE_TYPE_CUT_OFF (0xfUL << 1)#define CQ_BASE_CQE_TYPE_LAST CQ_BASE_CQE_TYPE_CUT_OFFu8 status; +#define CQ_BASE_STATUS_OK 0x0UL +#define CQ_BASE_STATUS_BAD_RESPONSE_ERR 0x1UL +#define CQ_BASE_STATUS_LOCAL_LENGTH_ERR 0x2UL +#define CQ_BASE_STATUS_HW_LOCAL_LENGTH_ERR 0x3UL +#define CQ_BASE_STATUS_LOCAL_QP_OPERATION_ERR 0x4UL +#define CQ_BASE_STATUS_LOCAL_PROTECTION_ERR 0x5UL +#define CQ_BASE_STATUS_LOCAL_ACCESS_ERROR 0x6UL +#define CQ_BASE_STATUS_MEMORY_MGT_OPERATION_ERR 0x7UL +#define CQ_BASE_STATUS_REMOTE_INVALID_REQUEST_ERR 0x8UL +#define CQ_BASE_STATUS_REMOTE_ACCESS_ERR 0x9UL +#define CQ_BASE_STATUS_REMOTE_OPERATION_ERR 0xaUL +#define CQ_BASE_STATUS_RNR_NAK_RETRY_CNT_ERR 0xbUL +#define CQ_BASE_STATUS_TRANSPORT_RETRY_CNT_ERR 0xcUL +#define CQ_BASE_STATUS_WORK_REQUEST_FLUSHED_ERR 0xdUL +#define CQ_BASE_STATUS_HW_FLUSH_ERR 0xeUL +#define CQ_BASE_STATUS_OVERFLOW_ERR 0xfUL +#define CQ_BASE_STATUS_LAST CQ_BASE_STATUS_OVERFLOW_ERR__le16 reserved16; -__le32 reserved32; +__le32 opaque; };/* cq_req (size:256b/32B) */
@@ -4384,6 +4427,8 @@ struct cq_cutoff {#define CQ_CUTOFF_CQE_TYPE_SFT 1#define CQ_CUTOFF_CQE_TYPE_CUT_OFF (0xfUL << 1)#define CQ_CUTOFF_CQE_TYPE_LAST CQ_CUTOFF_CQE_TYPE_CUT_OFF +#define CQ_CUTOFF_RESIZE_TOGGLE_MASK 0x60UL +#define CQ_CUTOFF_RESIZE_TOGGLE_SFT 5u8 status;#define CQ_CUTOFF_STATUS_OK 0x0UL#define CQ_CUTOFF_STATUS_LAST CQ_CUTOFF_STATUS_OK
@@ -4435,6 +4480,8 @@ struct nq_srq_event {#define NQ_SRQ_EVENT_TYPE_SFT 0#define NQ_SRQ_EVENT_TYPE_SRQ_EVENT 0x32UL#define NQ_SRQ_EVENT_TYPE_LAST NQ_SRQ_EVENT_TYPE_SRQ_EVENT +#define NQ_SRQ_EVENT_TOGGLE_MASK 0xc0UL +#define NQ_SRQ_EVENT_TOGGLE_SFT 6u8 event;#define NQ_SRQ_EVENT_EVENT_SRQ_THRESHOLD_EVENT 0x1UL#define NQ_SRQ_EVENT_EVENT_LAST NQ_SRQ_EVENT_EVENT_SRQ_THRESHOLD_EVENT
Signature · 1 line
2.5.5
Selvin Xavier
maintainerPATCH 4/6 RDMA/bnxt_re: Get the toggle bits from CQ completions
In reply to Selvin XavierGet the toggle bits from CQ completions. For older adapters these values are 0.
--- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 6 ++++++ drivers/infiniband/hw/bnxt_re/qplib_fp.h | 1 + drivers/infiniband/hw/bnxt_re/qplib_res.h | 1 + 3 files changed, 8 insertions(+)
drivers/infiniband/hw/bnxt_re/qplib_fp.c +6 -0
@@ -330,6 +330,9 @@ static void bnxt_qplib_service_nq(struct tasklet_struct *t) cq = (struct bnxt_qplib_cq *)(unsigned long )q_handle;if (!cq)break ; + cq->toggle = (le16_to_cpu (nqe->info10_type) & +NQ_CN_TOGGLE_MASK ) >>NQ_CN_TOGGLE_SFT ; + cq->dbinfo.toggle = cq->toggle;bnxt_qplib_armen_db (&cq->dbinfo,DBC_DBC_TYPE_CQ_ARMENA );spin_lock_bh (&cq->compl_lock);
@@ -2124,6 +2127,8 @@ int bnxt_qplib_create_cq(struct bnxt_qplib_res *res, struct bnxt_qplib_cq *cq) cq->dbinfo.xid = cq->id; cq->dbinfo.db = cq->dpi->dbr; cq->dbinfo.priv_db = res->dpi_tbl.priv_db; + cq->dbinfo.flags =0 ; + cq->dbinfo.toggle =0 ;bnxt_qplib_armen_db (&cq->dbinfo,DBC_DBC_TYPE_CQ_ARMENA );
@@ -3018,6 +3023,7 @@ int bnxt_qplib_poll_cq(struct bnxt_qplib_cq *cq, struct bnxt_qplib_cqe *cqe,void bnxt_qplib_req_notify_cq (struct bnxt_qplib_cq *cq,u32 arm_type) { + cq->dbinfo.toggle = cq->toggle;if (arm_type)bnxt_qplib_ring_db (&cq->dbinfo, arm_type);/* Using cq->arm_state variable to track whether to issue cq handler */
drivers/infiniband/hw/bnxt_re/qplib_fp.h +1 -0
@@ -418,6 +418,7 @@ struct bnxt_qplib_cq {bool resize_in_progress;struct bnxt_qplib_sg_info sg_info;u64 cq_handle; +u8 toggle;#define CQ_RESIZE_WAIT_TIME_MS 500unsigned long flags;
drivers/infiniband/hw/bnxt_re/qplib_res.h +1 -0
@@ -190,6 +190,7 @@ struct bnxt_qplib_db_info {u32 xid;u32 max_slot;u32 flags; +u8 toggle; };enum bnxt_qplib_db_info_flags_mask {
Signature · 1 line
2.5.5
Selvin Xavier
maintainerPATCH 5/6 RDMA/bnxt_re: Doorbell changes
In reply to Selvin XavierUpdate the Doorbell routines to support the latest HW definitions. Use common routine to prepare the Doorbell key.
--- drivers/infiniband/hw/bnxt_re/qplib_res.h | 46 +++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 11 deletions(-)
drivers/infiniband/hw/bnxt_re/qplib_res.h +35 -11
@@ -47,6 +47,9 @@ extern const struct bnxt_qplib_gid bnxt_qplib_gid_zero;#define CHIP_NUM_58818 0xd818#define CHIP_NUM_57608 0x1760 +#define BNXT_QPLIB_DBR_VALID (0x1UL << 26) +#define BNXT_QPLIB_DBR_EPOCH_SHIFT 24 +#define BNXT_QPLIB_DBR_TOGGLE_SHIFT 25struct bnxt_qplib_drv_modes {u8 wqe_mode;
@@ -200,6 +203,11 @@ enum bnxt_qplib_db_info_flags_mask { BNXT_QPLIB_FLAG_EPOCH_PROD_MASK = 0x2UL, }; +enum bnxt_qplib_db_epoch_flag_shift { +BNXT_QPLIB_DB_EPOCH_CONS_SHIFT =BNXT_QPLIB_DBR_EPOCH_SHIFT , +BNXT_QPLIB_DB_EPOCH_PROD_SHIFT = (BNXT_QPLIB_DBR_EPOCH_SHIFT -1 ), +}; +/* Tables */ struct bnxt_qplib_pd_tbl {unsigned long *tbl;
@@ -453,14 +461,27 @@ static inline void bnxt_qplib_ring_db32(struct bnxt_qplib_db_info *info,writel (key, info->db); } +#define BNXT_QPLIB_INIT_DBHDR (xid, type, indx, toggle) \ + (((u64)(((xid) & DBC_DBC_XID_MASK) | DBC_DBC_PATH_ROCE | \ + (type) | BNXT_QPLIB_DBR_VALID) << 32) | (indx) | \ + (((u32)(toggle)) << (BNXT_QPLIB_DBR_TOGGLE_SHIFT))) +static inline void bnxt_qplib_ring_db (struct bnxt_qplib_db_info *info,u32 type) {u64 key =0 ; +u32 indx; +u8 toggle =0 ; + +if (type ==DBC_DBC_TYPE_CQ_ARMALL || + type ==DBC_DBC_TYPE_CQ_ARMSE ) + toggle = info->toggle; + + indx = (info->hwq->cons &DBC_DBC_INDEX_MASK ) | + ((info->flags &BNXT_QPLIB_FLAG_EPOCH_CONS_MASK ) << +BNXT_QPLIB_DB_EPOCH_CONS_SHIFT ); - key = (info->xid &DBC_DBC_XID_MASK ) |DBC_DBC_PATH_ROCE | type; - key <<=32 ; - key |= (info->hwq->cons &DBC_DBC_INDEX_MASK ); + key =BNXT_QPLIB_INIT_DBHDR (info->xid, type, indx, toggle);writeq (key, info->db); }
@@ -468,10 +489,12 @@ static inline void bnxt_qplib_ring_prod_db(struct bnxt_qplib_db_info *info, u32 type) {u64 key =0 ; +u32 indx; - key = (info->xid &DBC_DBC_XID_MASK ) |DBC_DBC_PATH_ROCE | type; - key <<=32 ; - key |= ((info->hwq->prod / info->max_slot)) &DBC_DBC_INDEX_MASK ; + indx = (((info->hwq->prod / info->max_slot) &DBC_DBC_INDEX_MASK ) | + ((info->flags &BNXT_QPLIB_FLAG_EPOCH_PROD_MASK ) << +BNXT_QPLIB_DB_EPOCH_PROD_SHIFT )); + key =BNXT_QPLIB_INIT_DBHDR (info->xid, type, indx,0 );writeq (key, info->db); }
@@ -479,9 +502,12 @@ static inline void bnxt_qplib_armen_db(struct bnxt_qplib_db_info *info, u32 type) {u64 key =0 ; +u8 toggle =0 ; - key = (info->xid &DBC_DBC_XID_MASK ) |DBC_DBC_PATH_ROCE | type; - key <<=32 ; +if (type ==DBC_DBC_TYPE_CQ_ARMENA || type ==DBC_DBC_TYPE_SRQ_ARMENA ) + toggle = info->toggle; +/* Index always at 0 */ + key =BNXT_QPLIB_INIT_DBHDR (info->xid, type,0 , toggle);writeq (key, info->priv_db); }
@@ -490,9 +516,7 @@ static inline void bnxt_qplib_srq_arm_db(struct bnxt_qplib_db_info *info, {u64 key =0 ; - key = (info->xid &DBC_DBC_XID_MASK ) |DBC_DBC_PATH_ROCE | th; - key <<=32 ; - key |= th &DBC_DBC_INDEX_MASK ; + key =BNXT_QPLIB_INIT_DBHDR (info->xid,DBC_DBC_TYPE_SRQ_ARM , th, info->toggle);writeq (key, info->priv_db); }
Signature · 1 line
2.5.5
Selvin Xavier
maintainerPATCH 6/6 RDMA/bnxt_re: Adds MSN table capability for Gen P7 adapters
In reply to Selvin XavierGenP7 HW expects an MSN table instead of PSN table. Check for the HW retransmission capability and populate the MSN table if HW retansmission is supported.
--- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 67 +++++++++++++++++++++++++++--- drivers/infiniband/hw/bnxt_re/qplib_fp.h | 14 +++++++ drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 2 + drivers/infiniband/hw/bnxt_re/qplib_res.h | 9 ++++ include/uapi/rdma/bnxt_re-abi.h | 1 + 5 files changed, 87 insertions(+), 6 deletions(-)
drivers/infiniband/hw/bnxt_re/qplib_fp.c +61 -6
@@ -982,6 +982,9 @@ int bnxt_qplib_create_qp(struct bnxt_qplib_res *res, struct bnxt_qplib_qp *qp)u32 tbl_indx;u16 nsge; +if (res->dattr) + qp->dev_cap_flags = res->dattr->dev_cap_flags; + sq->dbinfo.flags =0 ; bnxt_qplib_rcfw_cmd_prep((struct cmdq_base *)&req, CMDQ_BASE_OPCODE_CREATE_QP,
@@ -997,6 +1000,11 @@ int bnxt_qplib_create_qp(struct bnxt_qplib_res *res, struct bnxt_qplib_qp *qp) psn_sz =bnxt_qplib_is_chip_gen_p5_p7 (res->cctx) ?sizeof (struct sq_psn_search_ext ) :sizeof (struct sq_psn_search ); + +if (BNXT_RE_HW_RETX (qp->dev_cap_flags)) { + psn_sz =sizeof (struct sq_msn_search ); + qp->msn =0 ; + } } hwq_attr.res = res;
@@ -1005,6 +1013,13 @@ int bnxt_qplib_create_qp(struct bnxt_qplib_res *res, struct bnxt_qplib_qp *qp) hwq_attr.depth =bnxt_qplib_get_depth (sq); hwq_attr.aux_stride = psn_sz; hwq_attr.aux_depth =bnxt_qplib_set_sq_size (sq, qp->wqe_mode); +/* Update msn tbl size */ +if (BNXT_RE_HW_RETX (qp->dev_cap_flags) && psn_sz) { + hwq_attr.aux_depth =roundup_pow_of_two (bnxt_qplib_set_sq_size (sq, qp->wqe_mode)); + qp->msn_tbl_sz = hwq_attr.aux_depth; + qp->msn =0 ; + } + hwq_attr.type =HWQ_TYPE_QUEUE ; rc =bnxt_qplib_alloc_init_hwq (&sq->hwq, &hwq_attr);if (rc)
@@ -1587,6 +1602,27 @@ void *bnxt_qplib_get_qp1_rq_buf(struct bnxt_qplib_qp *qp,return NULL ; } +/* Fil the MSN table into the next psn row */ +static void bnxt_qplib_fill_msn_search (struct bnxt_qplib_qp *qp, +struct bnxt_qplib_swqe *wqe, +struct bnxt_qplib_swq *swq) +{ +struct sq_msn_search *msns; +u32 start_psn, next_psn; +u16 start_idx; + + msns = (struct sq_msn_search *)swq->psn_search; + msns->start_idx_next_psn_start_psn =0 ; + + start_psn = swq->start_psn; + next_psn = swq->next_psn; + start_idx = swq->slot_idx; + msns->start_idx_next_psn_start_psn |= +bnxt_re_update_msn_tbl (start_idx, next_psn, start_psn); + qp->msn++; + qp->msn %= qp->msn_tbl_sz; +} +static void bnxt_qplib_fill_psn_search (struct bnxt_qplib_qp *qp,struct bnxt_qplib_swqe *wqe,struct bnxt_qplib_swq *swq)
@@ -1598,6 +1634,12 @@ static void bnxt_qplib_fill_psn_search(struct bnxt_qplib_qp *qp,if (!swq->psn_search)return ; +/* Handle MSN differently on cap flags */ +if (BNXT_RE_HW_RETX (qp->dev_cap_flags)) { +bnxt_qplib_fill_msn_search (qp, wqe, swq); +return ; + } + psns = (struct sq_psn_search *)swq->psn_search; psns = swq->psn_search; psns_ext = swq->psn_ext;
@@ -1706,8 +1748,8 @@ static u16 bnxt_qplib_required_slots(struct bnxt_qplib_qp *qp,return slot; } -static void bnxt_qplib_pull_psn_buff (struct bnxt_qplib_q *sq, -struct bnxt_qplib_swq *swq) +static void bnxt_qplib_pull_psn_buff (struct bnxt_qplib_qp *qp,struct bnxt_qplib_q *sq, +struct bnxt_qplib_swq *swq,bool hw_retx) {struct bnxt_qplib_hwq *hwq;u32 pg_num, pg_indx;
@@ -1718,6 +1760,11 @@ static void bnxt_qplib_pull_psn_buff(struct bnxt_qplib_q *sq,if (!hwq->pad_pg)return ; tail = swq->slot_idx / sq->dbinfo.max_slot; +if (hw_retx) { +/* For HW retx use qp msn index */ + tail = qp->msn; + tail %= qp->msn_tbl_sz; + } pg_num = (tail + hwq->pad_pgofft) / (PAGE_SIZE / hwq->pad_stride); pg_indx = (tail + hwq->pad_pgofft) % (PAGE_SIZE / hwq->pad_stride); buff = (void *)(hwq->pad_pg[pg_num] + pg_indx * hwq->pad_stride);
@@ -1742,6 +1789,7 @@ int bnxt_qplib_post_send(struct bnxt_qplib_qp *qp,struct bnxt_qplib_swq *swq;bool sch_handler = false;u16 wqe_sz, qdf =0 ; +bool msn_update;void *base_hdr;void *ext_hdr;__le32 temp32;
@@ -1769,7 +1817,7 @@ int bnxt_qplib_post_send(struct bnxt_qplib_qp *qp, } swq =bnxt_qplib_get_swqe (sq, &wqe_idx); -bnxt_qplib_pull_psn_buff (sq, swq); +bnxt_qplib_pull_psn_buff (qp, sq, swq,BNXT_RE_HW_RETX (qp->dev_cap_flags)); idx =0 ; swq->slot_idx = hwq->prod;
@@ -1801,6 +1849,8 @@ int bnxt_qplib_post_send(struct bnxt_qplib_qp *qp, &idx);if (data_len <0 ) goto queue_err; +/* Make sure we update MSN table only for wired wqes */ + msn_update = true;/* Specifics */ switch (wqe->type) {case BNXT_QPLIB_SWQE_TYPE_SEND :
@@ -1841,6 +1891,7 @@ int bnxt_qplib_post_send(struct bnxt_qplib_qp *qp, SQ_SEND_DST_QP_MASK); ext_sqe->avid =cpu_to_le32 (wqe->send.avid &SQ_SEND_AVID_MASK ); + msn_update = false; }else { sqe->length =cpu_to_le32 (data_len);if (qp->mtu)
@@ -1898,7 +1949,7 @@ int bnxt_qplib_post_send(struct bnxt_qplib_qp *qp, sqe->wqe_type = wqe->type; sqe->flags = wqe->flags; sqe->inv_l_key =cpu_to_le32 (wqe->local_inv.inv_l_key); - + msn_update = false;break ; }case BNXT_QPLIB_SWQE_TYPE_FAST_REG_MR :
@@ -1930,6 +1981,7 @@ int bnxt_qplib_post_send(struct bnxt_qplib_qp *qp, PTU_PTE_VALID); ext_sqe->pblptr =cpu_to_le64 (wqe->frmr.pbl_dma_ptr); ext_sqe->va =cpu_to_le64 (wqe->frmr.va); + msn_update = false;break ; }
@@ -1947,6 +1999,7 @@ int bnxt_qplib_post_send(struct bnxt_qplib_qp *qp, sqe->l_key =cpu_to_le32 (wqe->bind.r_key); ext_sqe->va =cpu_to_le64 (wqe->bind.va); ext_sqe->length_lo =cpu_to_le32 (wqe->bind.length); + msn_update = false;break ; }default :
@@ -1954,8 +2007,10 @@ int bnxt_qplib_post_send(struct bnxt_qplib_qp *qp, rc = -EINVAL ; goto done; } - swq->next_psn = sq->psn &BTH_PSN_MASK ; -bnxt_qplib_fill_psn_search (qp, wqe, swq); +if (!BNXT_RE_HW_RETX (qp->dev_cap_flags) || msn_update) { + swq->next_psn = sq->psn &BTH_PSN_MASK ; +bnxt_qplib_fill_psn_search (qp, wqe, swq); + } queue_err:bnxt_qplib_swq_mod_start (sq, wqe_idx);bnxt_qplib_hwq_incr_prod (&sq->dbinfo, hwq, swq->slots);
drivers/infiniband/hw/bnxt_re/qplib_fp.h +14 -0
@@ -338,6 +338,9 @@ struct bnxt_qplib_qp {dma_addr_t rq_hdr_buf_map;struct list_head sq_flush;struct list_head rq_flush; +u32 msn; +u32 msn_tbl_sz; +u16 dev_cap_flags; };#define BNXT_QPLIB_MAX_CQE_ENTRY_SIZE sizeof(struct cq_base)
@@ -627,4 +630,15 @@ static inline u16 bnxt_qplib_calc_ilsize(struct bnxt_qplib_swqe *wqe, u16 max) return size; } + +/* MSN table update inlin */ +static inline uint64_t bnxt_re_update_msn_tbl (u32 st_idx,u32 npsn,u32 start_psn) +{ +return cpu_to_le64 ((((u64)(st_idx) <<SQ_MSN_SEARCH_START_IDX_SFT ) & +SQ_MSN_SEARCH_START_IDX_MASK ) | + (((u64)(npsn) <<SQ_MSN_SEARCH_NEXT_PSN_SFT ) & +SQ_MSN_SEARCH_NEXT_PSN_MASK ) | + (((start_psn) <<SQ_MSN_SEARCH_START_PSN_SFT ) & +SQ_MSN_SEARCH_START_PSN_MASK )); +}#endif /* __BNXT_QPLIB_FP_H__ */
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +2 -0
@@ -905,6 +905,8 @@ int bnxt_qplib_init_rcfw(struct bnxt_qplib_rcfw *rcfw, req.max_gid_per_vf =cpu_to_le32 (ctx->vf_res.max_gid_per_vf); skip_ctx_setup: +if (BNXT_RE_HW_RETX (rcfw->res->dattr->dev_cap_flags)) + req.flags |=CMDQ_INITIALIZE_FW_FLAGS_HW_REQUESTER_RETX_SUPPORTED ; req.stat_ctx_id =cpu_to_le32 (ctx->stats.fw_id);bnxt_qplib_fill_cmdqmsg (&msg, &req, &resp,NULL ,sizeof (req),sizeof (resp),0 ); rc =bnxt_qplib_rcfw_send_message (rcfw, &msg);
drivers/infiniband/hw/bnxt_re/qplib_res.h +9 -0
@@ -539,6 +539,15 @@ static inline bool _is_ext_stats_supported(u16 dev_cap_flags)CREQ_QUERY_FUNC_RESP_SB_EXT_STATS ; } +static inline bool _is_hw_retx_supported (u16 dev_cap_flags) +{ +return dev_cap_flags & + (CREQ_QUERY_FUNC_RESP_SB_HW_REQUESTER_RETX_ENABLED | +CREQ_QUERY_FUNC_RESP_SB_HW_RESPONDER_RETX_ENABLED ); +} + +#define BNXT_RE_HW_RETX (a) _is_hw_retx_supported((a)) +static inline u8 bnxt_qplib_dbr_pacing_en (struct bnxt_qplib_chip_ctx *cctx) {return cctx->modes.dbr_pacing;
include/uapi/rdma/bnxt_re-abi.h +1 -0
@@ -55,6 +55,7 @@ enum {BNXT_RE_UCNTX_CMASK_WC_DPI_ENABLED =0x04ULL ,BNXT_RE_UCNTX_CMASK_DBR_PACING_ENABLED =0x08ULL ,BNXT_RE_UCNTX_CMASK_POW2_DISABLED =0x10ULL , + BNXT_RE_COMP_MASK_UCNTX_HW_RETX_ENABLED = 0x40, }; enum bnxt_re_wqe_mode {
Signature · 1 line
2.5.5
Leon Romanovsky
AppliedQuoted 8 lines · Selvin Xavier
This is the first series for adding support for Gen P7 Adapters. Includes the basic changes to detect the device and load. Adds the Doorbell changes for the new adapter and MSN capability to enable the FW initialization of the adapter.
Please review and apply.
[...]
Applied, thanks!
[1/6] RDMA/bnxt_re: Support new 5760X P7 devices
https://git.kernel.org/rdma/rdma/c/1801d87b3598b1 [2/6] RDMA/bnxt_re: Update the BAR offsets https://git.kernel.org/rdma/rdma/c/a62d6858144166 [3/6] RDMA/bnxt_re: Update the HW interface definitions https://git.kernel.org/rdma/rdma/c/880a5dd1880a29 [4/6] RDMA/bnxt_re: Get the toggle bits from CQ completions https://git.kernel.org/rdma/rdma/c/6027c20dad1ad1 [5/6] RDMA/bnxt_re: Doorbell changes https://git.kernel.org/rdma/rdma/c/cdae3936b2fe7f [6/6] RDMA/bnxt_re: Adds MSN table capability for Gen P7 adapters https://git.kernel.org/rdma/rdma/c/07f830ae4913d0
Best regards,
Signature · 1 line
Leon Romanovsky <[email protected]>