RDMA/bnxt_re: Get the toggle bits from SRQ events

[ Upstream commit 640c2cf84e1de62e6bb0738dc2128d5506e7e5bc ]

SRQ arming requires the toggle bits received from hardware.
Get the toggle bits from SRQ notification for the
gen p7 adapters. This value will be zero for the older adapters.

Signed-off-by: Hongguang Gao <hongguang.gao@broadcom.com>
Signed-off-by: Chandramohan Akula <chandramohan.akula@broadcom.com>
Signed-off-by: Selvin Xavier <selvin.xavier@broadcom.com>
Link: https://patch.msgid.link/1724945645-14989-2-git-send-email-selvin.xavier@broadcom.com
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Stable-dep-of: 2df411353dac ("RDMA/bnxt_re: Change the sequence of updating the CQ toggle value")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/infiniband/hw/bnxt_re/ib_verbs.h b/drivers/infiniband/hw/bnxt_re/ib_verbs.h
index e98cb17173385b90797e9e6c474ff218a35f46da..b368916a5bcfcb2d95db35d1d5017c6d01902663 100644 (file)
--- a/drivers/infiniband/hw/bnxt_re/ib_verbs.h
+++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.h
@@ -77,6 +77,7 @@ struct bnxt_re_srq {
        struct bnxt_qplib_srq   qplib_srq;
        struct ib_umem          *umem;
        spinlock_t              lock;           /* protect srq */
+       void                    *uctx_srq_page;
 };
 
 struct bnxt_re_qp {

diff --git a/drivers/infiniband/hw/bnxt_re/qplib_fp.c b/drivers/infiniband/hw/bnxt_re/qplib_fp.c
index 49e4a4a50bfaeb2784330eec016be435f21aef0e..19bb45329a19b870e00f91d021600a2d3eb524f8 100644 (file)
--- a/drivers/infiniband/hw/bnxt_re/qplib_fp.c
+++ b/drivers/infiniband/hw/bnxt_re/qplib_fp.c
@@ -54,6 +54,10 @@
 #include "qplib_rcfw.h"
 #include "qplib_sp.h"
 #include "qplib_fp.h"
+#include <rdma/ib_addr.h>
+#include "bnxt_ulp.h"
+#include "bnxt_re.h"
+#include "ib_verbs.h"
 
 static void __clean_cq(struct bnxt_qplib_cq *cq, u64 qp);
 
@@ -347,6 +351,7 @@ static void bnxt_qplib_service_nq(struct tasklet_struct *t)
                case NQ_BASE_TYPE_SRQ_EVENT:
                {
                        struct bnxt_qplib_srq *srq;
+                       struct bnxt_re_srq *srq_p;
                        struct nq_srq_event *nqsrqe =
                                                (struct nq_srq_event *)nqe;
 
@@ -354,6 +359,12 @@ static void bnxt_qplib_service_nq(struct tasklet_struct *t)
                        q_handle |= (u64)le32_to_cpu(nqsrqe->srq_handle_high)
                                     << 32;
                        srq = (struct bnxt_qplib_srq *)q_handle;
+                       srq->toggle = (le16_to_cpu(nqe->info10_type) & NQ_CN_TOGGLE_MASK)
+                                     >> NQ_CN_TOGGLE_SFT;
+                       srq->dbinfo.toggle = srq->toggle;
+                       srq_p = container_of(srq, struct bnxt_re_srq, qplib_srq);
+                       if (srq_p->uctx_srq_page)
+                               *((u32 *)srq_p->uctx_srq_page) = srq->toggle;
                        bnxt_qplib_armen_db(&srq->dbinfo,
                                            DBC_DBC_TYPE_SRQ_ARMENA);
                        if (nq->srqn_handler(nq,

diff --git a/drivers/infiniband/hw/bnxt_re/qplib_fp.h b/drivers/infiniband/hw/bnxt_re/qplib_fp.h
index c7412e461436f9121b239ba34c6be03f0ee938ec..389862df818d99bec7f4213d59a7f05c501853ee 100644 (file)
--- a/drivers/infiniband/hw/bnxt_re/qplib_fp.h
+++ b/drivers/infiniband/hw/bnxt_re/qplib_fp.h
@@ -105,6 +105,7 @@ struct bnxt_qplib_srq {
        struct bnxt_qplib_sg_info       sg_info;
        u16                             eventq_hw_ring_id;
        spinlock_t                      lock; /* protect SRQE link list */
+       u8                              toggle;
 };
 
 struct bnxt_qplib_sge {