RDMA/bnxt_re: Adds MSN table capability for Gen P7 adapters

GenP7 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.

Signed-off-by: Damodharam Ammepalli <damodharam.ammepalli@broadcom.com>
Signed-off-by: Selvin Xavier <selvin.xavier@broadcom.com>
Link: https://lore.kernel.org/r/1701946060-13931-7-git-send-email-selvin.xavier@broadcom.com
Signed-off-by: Leon Romanovsky <leon@kernel.org>

diff --git a/drivers/infiniband/hw/bnxt_re/qplib_fp.c b/drivers/infiniband/hw/bnxt_re/qplib_fp.c
index 177c6c185f0c46fef0193b71d3bde97f54801877..c98e04fe2ddd477dd8457c09bef64c9339b992f4 100644 (file)
--- a/drivers/infiniband/hw/bnxt_re/qplib_fp.c
+++ b/drivers/infiniband/hw/bnxt_re/qplib_fp.c
@@ -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);

diff --git a/drivers/infiniband/hw/bnxt_re/qplib_fp.h b/drivers/infiniband/hw/bnxt_re/qplib_fp.h
index 8a6bea201b2911c2dbf4a3ff5f3b2c701d859032..967c6691e413ed46fb3972fb8a538c641c9f0f92 100644 (file)
--- a/drivers/infiniband/hw/bnxt_re/qplib_fp.h
+++ b/drivers/infiniband/hw/bnxt_re/qplib_fp.h
@@ -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__ */

diff --git a/drivers/infiniband/hw/bnxt_re/qplib_rcfw.c b/drivers/infiniband/hw/bnxt_re/qplib_rcfw.c
index 403b6797d9c2386a5b082d82b0e06a8e629c3901..0ea7ccc70679f812e38b1875bc7e4a897556563b 100644 (file)
--- a/drivers/infiniband/hw/bnxt_re/qplib_rcfw.c
+++ b/drivers/infiniband/hw/bnxt_re/qplib_rcfw.c
@@ -905,6 +905,8 @@ config_vf_res:
        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);

diff --git a/drivers/infiniband/hw/bnxt_re/qplib_res.h b/drivers/infiniband/hw/bnxt_re/qplib_res.h
index c228870eed297d405ea9849f4e8dfb1e35fd0928..382d89fa7d16d682c1594441fbe456f5c5e98fb4 100644 (file)
--- a/drivers/infiniband/hw/bnxt_re/qplib_res.h
+++ b/drivers/infiniband/hw/bnxt_re/qplib_res.h
@@ -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;

diff --git a/include/uapi/rdma/bnxt_re-abi.h b/include/uapi/rdma/bnxt_re-abi.h
index a1b896d6d94058907217e3bb72264dc81668308c..3342276aeac137c1b71b70801bae5ce94cc3d022 100644 (file)
--- a/include/uapi/rdma/bnxt_re-abi.h
+++ b/include/uapi/rdma/bnxt_re-abi.h
@@ -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 {