RDMA/bnxt_re: Fix to export port num to ib_query_qp
Subsystems (3)
Sasha Levin
maintainerPATCH 1/2 RDMA/bnxt_re: Fix to export port num to ib_query_qp
From: Hongguang Gao <[email protected]>
[ Upstream commit 34db8ec931b84d1426423f263b1927539e73b397 ]
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 Saravanan Vajravel <[email protected]>
Reviewed-by Kalesh AP <[email protected]>
Signed-off-by Hongguang Gao <[email protected]>
Signed-off-by Selvin Xavier <[email protected]>
Signed-off-by Leon Romanovsky <[email protected]>
Signed-off-by Sasha Levin <[email protected]>
--- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 1 + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 4 ++++ drivers/infiniband/hw/bnxt_re/qplib_fp.c | 1 + drivers/infiniband/hw/bnxt_re/qplib_fp.h | 1 + 4 files changed, 7 insertions(+)
drivers/infiniband/hw/bnxt_re/ib_verbs.c +1 -0
@@ -2214,6 +2214,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
@@ -245,6 +245,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
@@ -1451,6 +1451,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
@@ -297,6 +297,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;
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 2/2 nvmet: propagate npwg topology
From: Luis Chamberlain <[email protected]>
[ Upstream commit b579d6fdc3a9149bb4d2b3133cc0767130ed13e6 ]
Ensure we propagate npwg to the target as well instead of assuming its the same logical blocks per physical block.
This ensures devices with large IUs information properly propagated on the target.
Signed-off-by Luis Chamberlain <[email protected]>
Reviewed-by Sagi Grimberg <[email protected]>
Signed-off-by Keith Busch <[email protected]>
Signed-off-by Sasha Levin <[email protected]>
--- drivers/nvme/target/io-cmd-bdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/target/io-cmd-bdev.c +1 -1
@@ -36,7 +36,7 @@ void nvmet_bdev_set_limits(struct block_device *bdev, struct nvme_id_ns *id)*/ id->nsfeat |=1 <<4 ;/* NPWG = Namespace Preferred Write Granularity. 0's based */ - id->npwg = lpp0b; + id->npwg =to0based (bdev_io_min (bdev) /bdev_logical_block_size (bdev));/* NPWA = Namespace Preferred Write Alignment. 0's based */ id->npwa = id->npwg;/* NPDG = Namespace Preferred Deallocate Granularity. 0's based */
Signature · 1 line
2.39.5