Commit 1a0204e6 authored by Kalesh AP's avatar Kalesh AP Committed by Wen Zhiwei
Browse files

RDMA/bnxt_re: Fix unconditional fence for newer adapters 

stable inclusion
from stable-v6.6.59
commit 042804a9fff166c0eb7874a57a38d1115849b3e3
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB3ENL

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=042804a9fff166c0eb7874a57a38d1115849b3e3



--------------------------------

commit 8eaca6b5997bd8fd7039f2693e4ecf112823c816 upstream.

Older adapters required an unconditional fence for
non-wire memory operations. Newer adapters doesn't require
this and therefore, disabling the unconditional fence.

Fixes: 1801d87b3598 ("RDMA/bnxt_re: Support new 5760X P7 devices")
Signed-off-by: default avatarKashyap Desai <kashyap.desai@broadcom.com>
Signed-off-by: default avatarKalesh AP <kalesh-anakkur.purayil@broadcom.com>
Signed-off-by: default avatarSelvin Xavier <selvin.xavier@broadcom.com>
Link: https://lore.kernel.org/r/1705985677-15551-4-git-send-email-selvin.xavier@broadcom.com


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 0a3c5728

drivers/infiniband/hw/bnxt_re/ib_verbs.c

+16 −12
Original line number Diff line number Diff line
@@ -2563,11 +2563,6 @@ static int bnxt_re_build_inv_wqe(const struct ib_send_wr *wr, 
	wqe->type = BNXT_QPLIB_SWQE_TYPE_LOCAL_INV;

	wqe->local_inv.inv_l_key = wr->ex.invalidate_rkey;



	/* Need unconditional fence for local invalidate

	 * opcode to work as expected.

	 */

	wqe->flags |= BNXT_QPLIB_SWQE_FLAGS_UC_FENCE;



	if (wr->send_flags & IB_SEND_SIGNALED)

		wqe->flags |= BNXT_QPLIB_SWQE_FLAGS_SIGNAL_COMP;

	if (wr->send_flags & IB_SEND_SOLICITED)
@@ -2590,12 +2585,6 @@ static int bnxt_re_build_reg_wqe(const struct ib_reg_wr *wr, 
	wqe->frmr.levels = qplib_frpl->hwq.level;

	wqe->type = BNXT_QPLIB_SWQE_TYPE_REG_MR;



	/* Need unconditional fence for reg_mr

	 * opcode to function as expected.

	 */



	wqe->flags |= BNXT_QPLIB_SWQE_FLAGS_UC_FENCE;



	if (wr->wr.send_flags & IB_SEND_SIGNALED)

		wqe->flags |= BNXT_QPLIB_SWQE_FLAGS_SIGNAL_COMP;
@@ -2726,6 +2715,18 @@ static int bnxt_re_post_send_shadow_qp(struct bnxt_re_dev *rdev, 
	return rc;

}



static void bnxt_re_legacy_set_uc_fence(struct bnxt_qplib_swqe *wqe)

{

	/* Need unconditional fence for non-wire memory opcode

	 * to work as expected.

	 */

	if (wqe->type == BNXT_QPLIB_SWQE_TYPE_LOCAL_INV ||

	    wqe->type == BNXT_QPLIB_SWQE_TYPE_FAST_REG_MR ||

	    wqe->type == BNXT_QPLIB_SWQE_TYPE_REG_MR ||

	    wqe->type == BNXT_QPLIB_SWQE_TYPE_BIND_MW)

		wqe->flags |= BNXT_QPLIB_SWQE_FLAGS_UC_FENCE;

}



int bnxt_re_post_send(struct ib_qp *ib_qp, const struct ib_send_wr *wr,

		      const struct ib_send_wr **bad_wr)

{
@@ -2805,8 +2806,11 @@ int bnxt_re_post_send(struct ib_qp *ib_qp, const struct ib_send_wr *wr, 
			rc = -EINVAL;

			goto bad;

		}

		if (!rc)

		if (!rc) {

			if (!bnxt_qplib_is_chip_gen_p5_p7(qp->rdev->chip_ctx))

				bnxt_re_legacy_set_uc_fence(&wqe);

			rc = bnxt_qplib_post_send(&qp->qplib_qp, &wqe);

		}

bad:

		if (rc) {

			ibdev_err(&qp->rdev->ibdev,