RDMA/erdma: Correct the max_qp and max_cq capacities of the device
Subsystems (2)
Cheng Xu
maintainerPATCH 1/1 RDMA/erdma: Correct the max_qp and max_cq capacities of the device
QP0 in HW is used for CMDQ, and the rest is for RDMA QPs. So the actual max_qp capacity reported to core should be max_qp (reported by HW) - 1. So does max_cq.
--- drivers/infiniband/hw/erdma/erdma_verbs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/hw/erdma/erdma_verbs.c +2 -2
@@ -280,7 +280,7 @@ int erdma_query_device(struct ib_device *ibdev, struct ib_device_attr *attr, attr->vendor_id =PCI_VENDOR_ID_ALIBABA ; attr->vendor_part_id = dev->pdev->device; attr->hw_ver = dev->pdev->revision; - attr->max_qp = dev->attrs.max_qp; + attr->max_qp = dev->attrs.max_qp -1 ; attr->max_qp_wr =min (dev->attrs.max_send_wr, dev->attrs.max_recv_wr); attr->max_qp_rd_atom = dev->attrs.max_ord; attr->max_qp_init_rd_atom = dev->attrs.max_ird;
@@ -291,7 +291,7 @@ int erdma_query_device(struct ib_device *ibdev, struct ib_device_attr *attr, attr->max_send_sge = dev->attrs.max_send_sge; attr->max_recv_sge = dev->attrs.max_recv_sge; attr->max_sge_rd = dev->attrs.max_sge_rd; - attr->max_cq = dev->attrs.max_cq; + attr->max_cq = dev->attrs.max_cq -1 ; attr->max_cqe = dev->attrs.max_cqe; attr->max_mr = dev->attrs.max_mr; attr->max_pd = dev->attrs.max_pd;
Signature · 1 line
2.27.0
Cheng Xu
maintainerPATCH 1/1 RDMA/erdma: Using the key in FMR WR instead of MR structure
RDMA driver should get the MR key from FMR WR, not the MR structure passed in.
--- drivers/infiniband/hw/erdma/erdma_qp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/erdma/erdma_qp.c +1 -1
@@ -407,7 +407,7 @@ static int erdma_push_one_sqe(struct erdma_qp *qp, u16 *pi,to_erdma_access_flags (reg_wr (send_wr)->access); regmr_sge->addr =cpu_to_le64 (mr->ibmr.iova); regmr_sge->length =cpu_to_le32 (mr->ibmr.length); - regmr_sge->stag =cpu_to_le32 (mr->ibmr.lkey); + regmr_sge->stag =cpu_to_le32 (reg_wr (send_wr)->key); attrs =FIELD_PREP (ERDMA_SQE_MR_MODE_MASK ,0 ) |FIELD_PREP (ERDMA_SQE_MR_ACCESS_MASK , mr->access) | FIELD_PREP(ERDMA_SQE_MR_MTT_CNT_MASK,
Signature · 1 line
2.27.0
Leon Romanovsky
AppliedQuoted 10 lines · Cheng Xu
QP0 in HW is used for CMDQ, and the rest is for RDMA QPs. So the actual
max_qpcapacity reported to core should bemax_qp(reported by HW) - 1. So doesmax_cq.Fixes 155055771704 ("RDMA/erdma: Add verbs implementation")Signed-off-by Cheng Xu <[email protected]>--- drivers/infiniband/hw/erdma/erdma_verbs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Thanks, applied both patches to -rc.
As a note, please group the patches properly and not as a reply. Or send them separately, or use cover letter.
Thanks
Cheng Xu
maintainerQuoted 12 lines · Leon Romanovsky
Quoted 10 lines · Cheng Xu
QP0 in HW is used for CMDQ, and the rest is for RDMA QPs. So the actual
max_qpcapacity reported to core should bemax_qp(reported by HW) - 1. So doesmax_cq.Fixes 155055771704 ("RDMA/erdma: Add verbs implementation")Signed-off-by Cheng Xu <[email protected]>--- drivers/infiniband/hw/erdma/erdma_verbs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Quoted 4 lines
Thanks, applied both patches to -rc.
As a note, please group the patches properly and not as a reply. Or send them separately, or use cover letter.
It's my fault. I shouldn't send the two patches together in one git send-email command.
Thanks,
Cheng Xu