Commit 34db8ec9 authored by Hongguang Gao's avatar Hongguang Gao Committed by Leon Romanovsky
Browse files

RDMA/bnxt_re: Fix to export port num to ib_query_qp 



Current driver implementation doesn't populate the port_num
field in query_qp. Adding the code to convert internal firmware
port id to ibv defined port number and export it.

Reviewed-by: default avatarSaravanan Vajravel <saravanan.vajravel@broadcom.com>
Reviewed-by: default avatarKalesh AP <kalesh-anakkur.purayil@broadcom.com>
Signed-off-by: default avatarHongguang Gao <hongguang.gao@broadcom.com>
Signed-off-by: default avatarSelvin Xavier <selvin.xavier@broadcom.com>
Link: https://patch.msgid.link/20241211083931.968831-5-kalesh-anakkur.purayil@broadcom.com


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent da2132e6

drivers/infiniband/hw/bnxt_re/ib_verbs.c

+1 −0
Original line number Diff line number Diff line
@@ -2325,6 +2325,7 @@ int bnxt_re_query_qp(struct ib_qp *ib_qp, struct ib_qp_attr *qp_attr, 
	qp_attr->retry_cnt = qplib_qp->retry_cnt;

	qp_attr->rnr_retry = qplib_qp->rnr_retry;

	qp_attr->min_rnr_timer = qplib_qp->min_rnr_timer;

	qp_attr->port_num = __to_ib_port_num(qplib_qp->port_id);

	qp_attr->rq_psn = qplib_qp->rq.psn;

	qp_attr->max_rd_atomic = qplib_qp->max_rd_atomic;

	qp_attr->sq_psn = qplib_qp->sq.psn;

drivers/infiniband/hw/bnxt_re/ib_verbs.h

+4 −0
Original line number Diff line number Diff line
@@ -268,6 +268,10 @@ void bnxt_re_dealloc_ucontext(struct ib_ucontext *context); 
int bnxt_re_mmap(struct ib_ucontext *context, struct vm_area_struct *vma);

void bnxt_re_mmap_free(struct rdma_user_mmap_entry *rdma_entry);



static inline u32 __to_ib_port_num(u16 port_id)

{

	return (u32)port_id + 1;

}



unsigned long bnxt_re_lock_cqs(struct bnxt_re_qp *qp);

void bnxt_re_unlock_cqs(struct bnxt_re_qp *qp, unsigned long flags);

drivers/infiniband/hw/bnxt_re/qplib_fp.c

+1 −0
Original line number Diff line number Diff line
@@ -1532,6 +1532,7 @@ int bnxt_qplib_query_qp(struct bnxt_qplib_res *res, struct bnxt_qplib_qp *qp) 
	qp->dest_qpn = le32_to_cpu(sb->dest_qp_id);

	memcpy(qp->smac, sb->src_mac, 6);

	qp->vlan_id = le16_to_cpu(sb->vlan_pcp_vlan_dei_vlan_id);

	qp->port_id = le16_to_cpu(sb->port_id);

bail:

	dma_free_coherent(&rcfw->pdev->dev, sbuf.size,

			  sbuf.sb, sbuf.dma_addr);

drivers/infiniband/hw/bnxt_re/qplib_fp.h

+1 −0
Original line number Diff line number Diff line
@@ -298,6 +298,7 @@ struct bnxt_qplib_qp { 
	u32				dest_qpn;

	u8				smac[6];

	u16				vlan_id;

	u16				port_id;

	u8				nw_type;

	struct bnxt_qplib_ah		ah;