RDMA/hns: Fix the wrong value of rnr_retry when querying qp
authorWenpeng Liang <liangwenpeng@huawei.com>
Sat, 19 Sep 2020 10:03:20 +0000 (18:03 +0800)
committerJason Gunthorpe <jgg@nvidia.com>
Thu, 24 Sep 2020 18:56:27 +0000 (15:56 -0300)
The rnr_retry returned to the user is not correct, it should be got from
another fields in QPC.

Fixes: bfe860351e31 ("RDMA/hns: Fix cast from or to restricted __le32 for driver")
Link: https://lore.kernel.org/r/1600509802-44382-7-git-send-email-liweihang@huawei.com
Signed-off-by: Wenpeng Liang <liangwenpeng@huawei.com>
Signed-off-by: Weihang Li <liweihang@huawei.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
drivers/infiniband/hw/hns/hns_roce_hw_v2.c

index d4a4a66..f36e1a7 100644 (file)
@@ -4881,7 +4881,9 @@ static int hns_roce_v2_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr,
        qp_attr->retry_cnt = roce_get_field(context.byte_212_lsn,
                                            V2_QPC_BYTE_212_RETRY_CNT_M,
                                            V2_QPC_BYTE_212_RETRY_CNT_S);
-       qp_attr->rnr_retry = le32_to_cpu(context.rq_rnr_timer);
+       qp_attr->rnr_retry = roce_get_field(context.byte_244_rnr_rxack,
+                                           V2_QPC_BYTE_244_RNR_CNT_M,
+                                           V2_QPC_BYTE_244_RNR_CNT_S);
 
 done:
        qp_attr->cur_qp_state = qp_attr->qp_state;