Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55fa4883 authored by Jack Wang's avatar Jack Wang Committed by Greg Kroah-Hartman
Browse files

bnxt_re: Fix imm_data endianness 



[ Upstream commit 95b087f87b780daafad1dbb2c84e81b729d5d33f ]

When map a device between servers with MLX and BCM RoCE nics, RTRS
server complain about unknown imm type, and can't map the device,

After more debug, it seems bnxt_re wrongly handle the
imm_data, this patch fixed the compat issue with MLX for us.

In off list discussion, Selvin confirmed HW is working in little endian format
and all data needs to be converted to LE while providing.

This patch fix the endianness for imm_data

Fixes: 1ac5a404 ("RDMA/bnxt_re: Add bnxt_re RoCE driver")
Signed-off-by: default avatarJack Wang <jinpu.wang@ionos.com>
Link: https://lore.kernel.org/r/20240710122102.37569-1-jinpu.wang@ionos.com


Acked-by: default avatarSelvin Xavier <selvin.xavier@broadcom.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent b8f7d8f4

drivers/infiniband/hw/bnxt_re/ib_verbs.c

+4 −4
Original line number Diff line number Diff line
@@ -2271,7 +2271,7 @@ static int bnxt_re_build_send_wqe(struct bnxt_re_qp *qp, 
		break;

	case IB_WR_SEND_WITH_IMM:

		wqe->type = BNXT_QPLIB_SWQE_TYPE_SEND_WITH_IMM;

		wqe->send.imm_data = wr->ex.imm_data;

		wqe->send.imm_data = be32_to_cpu(wr->ex.imm_data);

		break;

	case IB_WR_SEND_WITH_INV:

		wqe->type = BNXT_QPLIB_SWQE_TYPE_SEND_WITH_INV;
@@ -2301,7 +2301,7 @@ static int bnxt_re_build_rdma_wqe(const struct ib_send_wr *wr, 
		break;

	case IB_WR_RDMA_WRITE_WITH_IMM:

		wqe->type = BNXT_QPLIB_SWQE_TYPE_RDMA_WRITE_WITH_IMM;

		wqe->rdma.imm_data = wr->ex.imm_data;

		wqe->rdma.imm_data = be32_to_cpu(wr->ex.imm_data);

		break;

	case IB_WR_RDMA_READ:

		wqe->type = BNXT_QPLIB_SWQE_TYPE_RDMA_READ;
@@ -3250,7 +3250,7 @@ static void bnxt_re_process_res_shadow_qp_wc(struct bnxt_re_qp *gsi_sqp, 
	wc->byte_len = orig_cqe->length;

	wc->qp = &gsi_qp->ib_qp;



	wc->ex.imm_data = orig_cqe->immdata;

	wc->ex.imm_data = cpu_to_be32(le32_to_cpu(orig_cqe->immdata));

	wc->src_qp = orig_cqe->src_qp;

	memcpy(wc->smac, orig_cqe->smac, ETH_ALEN);

	if (bnxt_re_is_vlan_pkt(orig_cqe, &vlan_id, &sl)) {
@@ -3391,7 +3391,7 @@ int bnxt_re_poll_cq(struct ib_cq *ib_cq, int num_entries, struct ib_wc *wc) 
				continue;

			}

			wc->qp = &qp->ib_qp;

			wc->ex.imm_data = cqe->immdata;

			wc->ex.imm_data = cpu_to_be32(le32_to_cpu(cqe->immdata));

			wc->src_qp = cqe->src_qp;

			memcpy(wc->smac, cqe->smac, ETH_ALEN);

			wc->port_num = 1;

drivers/infiniband/hw/bnxt_re/qplib_fp.h

+3 −3
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ struct bnxt_qplib_swqe { 
		/* Send, with imm, inval key */

		struct {

			union {

				__be32	imm_data;

				u32	imm_data;

				u32	inv_key;

			};

			u32		q_key;
@@ -163,7 +163,7 @@ struct bnxt_qplib_swqe { 
		/* RDMA write, with imm, read */

		struct {

			union {

				__be32	imm_data;

				u32	imm_data;

				u32	inv_key;

			};

			u64		remote_va;
@@ -350,7 +350,7 @@ struct bnxt_qplib_cqe { 
	u16				cfa_meta;

	u64				wr_id;

	union {

		__be32			immdata;

		__le32			immdata;

		u32			invrkey;

	};

	u64				qp_handle;