From 3b1f864c904915b3baebffb31ea05ee704b0df3c Mon Sep 17 00:00:00 2001

From: Luoyouming <luoyouming@huawei.com>

Date: Thu, 22 Sep 2022 20:33:13 +0800

Subject: [PATCH 1/1] RDMA/hns: Repacing 'dseg_len' by macros in

 fill_ext_sge_inl_data()

Git-commit: 3b1f864c904915b3baebffb31ea05ee704b0df3c

Patch-mainline: v6.1

References: git-fixes

The sge size is known to be constant, so it's unnecessary to use sizeof to

calculate.

Link: https://lore.kernel.org/r/20220922123315.3732205-11-xuhaoyue1@hisilicon.com

Signed-off-by: Luoyouming <luoyouming@huawei.com>

Signed-off-by: Haoyue Xu <xuhaoyue1@hisilicon.com>

Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

Acked-by: Nicolas Morey <nmorey@suse.com>

---

 drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 7 +++----

 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c

index 31bfea15cdfc..e1716f100dce 100644

--- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c

@@ -193,8 +193,7 @@ static int fill_ext_sge_inl_data(struct hns_roce_qp *qp,

 				 unsigned int *sge_idx, u32 msg_len)

 {

 	struct ib_device *ibdev = &(to_hr_dev(qp->ibqp.device))->ib_dev;

-	unsigned int dseg_len = sizeof(struct hns_roce_v2_wqe_data_seg);

-	unsigned int ext_sge_sz = qp->sq.max_gs * dseg_len;

+	unsigned int ext_sge_sz = qp->sq.max_gs * HNS_ROCE_SGE_SIZE;

 	unsigned int left_len_in_pg;

 	unsigned int idx = *sge_idx;

 	unsigned int i = 0;

@@ -222,7 +221,7 @@ static int fill_ext_sge_inl_data(struct hns_roce_qp *qp,

 		if (len <= left_len_in_pg) {

 			memcpy(dseg, addr, len);

-			idx += len / dseg_len;

+			idx += len / HNS_ROCE_SGE_SIZE;

 			i++;

 			if (i >= wr->num_sge)

@@ -237,7 +236,7 @@ static int fill_ext_sge_inl_data(struct hns_roce_qp *qp,

 			len -= left_len_in_pg;

 			addr += left_len_in_pg;

-			idx += left_len_in_pg / dseg_len;

+			idx += left_len_in_pg / HNS_ROCE_SGE_SIZE;

 			dseg = hns_roce_get_extend_sge(qp,

 						idx & (qp->sge.sge_cnt - 1));

 			left_len_in_pg = 1 << HNS_HW_PAGE_SHIFT;

-- 

2.38.0.1.gee35aeee4b76