Commit 0a3c5728 authored by Kalesh AP's avatar Kalesh AP Committed by Wen Zhiwei
Browse files

RDMA/bnxt_re: Avoid creating fence MR for newer adapters 

stable inclusion
from stable-v6.6.59
commit 67819f10702b2a160d19651b9538d276615df365
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=67819f10702b2a160d19651b9538d276615df365



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

commit 282fd66e2ef6e5d72b8fcd77efb2b282d2569464 upstream.

Limit the usage of fence MR to adapters older than Gen P5 products.

Fixes: 1801d87b3598 ("RDMA/bnxt_re: Support new 5760X P7 devices")
Signed-off-by: default avatarKashyap Desai <kashyap.desai@broadcom.com>
Signed-off-by: default avatarBhargava Chenna Marreddy <bhargava.marreddy@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-2-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 6e454e88

drivers/infiniband/hw/bnxt_re/ib_verbs.c

+10 −0
Original line number Diff line number Diff line
@@ -400,6 +400,10 @@ static void bnxt_re_create_fence_wqe(struct bnxt_re_pd *pd) 
	struct bnxt_re_fence_data *fence = &pd->fence;

	struct ib_mr *ib_mr = &fence->mr->ib_mr;

	struct bnxt_qplib_swqe *wqe = &fence->bind_wqe;

	struct bnxt_re_dev *rdev = pd->rdev;



	if (bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx))

		return;



	memset(wqe, 0, sizeof(*wqe));

	wqe->type = BNXT_QPLIB_SWQE_TYPE_BIND_MW;
@@ -454,6 +458,9 @@ static void bnxt_re_destroy_fence_mr(struct bnxt_re_pd *pd) 
	struct device *dev = &rdev->en_dev->pdev->dev;

	struct bnxt_re_mr *mr = fence->mr;



	if (bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx))

		return;



	if (fence->mw) {

		bnxt_re_dealloc_mw(fence->mw);

		fence->mw = NULL;
@@ -485,6 +492,9 @@ static int bnxt_re_create_fence_mr(struct bnxt_re_pd *pd) 
	struct ib_mw *mw;

	int rc;



	if (bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx))

		return 0;



	dma_addr = dma_map_single(dev, fence->va, BNXT_RE_FENCE_BYTES,

				  DMA_BIDIRECTIONAL);

	rc = dma_mapping_error(dev, dma_addr);