Commit 85566b9e authored by Chengchang Tang's avatar Chengchang Tang Committed by Zheng Zengkai
Browse files

Revert "RDMA/hns: Optimize the base address table config for MTR" 

driver inclusion
category: cleanup
bugzilla: https://gitee.com/openeuler/kernel/issues/I5X0C3



-----------------------------------------------------------

This reverts commit f9d4c848.

This patch is synchronized from the linux mainline, but some important
code is lost during synchronization. This results in a large code
difference between openEuler and the linux mainline.
It is a better option to revert the bad patch and resync a full patch
from the linux mainline. The resynchronized patch is the second patch
in this patchlist.

Signed-off-by: default avatarChengchang Tang <tangchengchang@huawei.com>
Reviewed-by: default avatarYangyang Li <liyangyang20@huawei.com>
Reviewed-by: default avatarHaoyue Xu <xuhaoyue1@hisilicon.com>
Reviewed-by: default avatarYueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 3d25668d

drivers/infiniband/hw/hns/hns_roce_cq.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static int alloc_cq_buf(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq, 
	buf_attr.region_count = 1;



	ret = hns_roce_mtr_create(hr_dev, &hr_cq->mtr, &buf_attr,

				  hr_dev->caps.cqe_ba_pg_sz + PAGE_SHIFT,

				  hr_dev->caps.cqe_ba_pg_sz + HNS_HW_PAGE_SHIFT,

				  udata, addr);

	if (ret)

		ibdev_err(ibdev, "Failed to alloc CQ mtr, ret = %d\n", ret);

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+2 −2
Original line number Diff line number Diff line
@@ -6365,14 +6365,14 @@ static int alloc_eq_buf(struct hns_roce_dev *hr_dev, struct hns_roce_eq *eq) 
	else

		eq->hop_num = hr_dev->caps.eqe_hop_num;



	buf_attr.page_shift = hr_dev->caps.eqe_buf_pg_sz + PAGE_SHIFT;

	buf_attr.page_shift = hr_dev->caps.eqe_buf_pg_sz + HNS_HW_PAGE_SHIFT;

	buf_attr.region[0].size = eq->entries * eq->eqe_size;

	buf_attr.region[0].hopnum = eq->hop_num;

	buf_attr.region_count = 1;



	err = hns_roce_mtr_create(hr_dev, &eq->mtr, &buf_attr,

				  hr_dev->caps.eqe_ba_pg_sz +

				  PAGE_SHIFT, NULL, 0);

				  HNS_HW_PAGE_SHIFT, NULL, 0);

	if (err)

		dev_err(hr_dev->dev, "Failed to alloc EQE mtr, err %d\n", err);

drivers/infiniband/hw/hns/hns_roce_mr.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static int alloc_mr_pbl(struct hns_roce_dev *hr_dev, struct hns_roce_mr *mr, 
	buf_attr.mtt_only = is_fast;



	err = hns_roce_mtr_create(hr_dev, &mr->pbl_mtr, &buf_attr,

				  hr_dev->caps.pbl_ba_pg_sz + PAGE_SHIFT,

				  hr_dev->caps.pbl_ba_pg_sz + HNS_HW_PAGE_SHIFT,

				  udata, start);

	if (err)

		ibdev_err(ibdev, "failed to alloc pbl mtr, ret = %d.\n", err);

drivers/infiniband/hw/hns/hns_roce_qp.c

+1 −1
Original line number Diff line number Diff line
@@ -752,7 +752,7 @@ static int alloc_qp_buf(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp, 
		goto err_inline;

	}

	ret = hns_roce_mtr_create(hr_dev, &hr_qp->mtr, &buf_attr,

				  PAGE_SHIFT + hr_dev->caps.mtt_ba_pg_sz,

				  HNS_HW_PAGE_SHIFT + hr_dev->caps.mtt_ba_pg_sz,

				  udata, addr);

	if (ret) {

		ibdev_err(ibdev, "failed to create WQE mtr, ret = %d.\n", ret);

drivers/infiniband/hw/hns/hns_roce_srq.c

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static int alloc_srq_idx(struct hns_roce_dev *hr_dev, struct hns_roce_srq *srq, 
	buf_attr.region_count = 1;



	ret = hns_roce_mtr_create(hr_dev, &idx_que->mtr, &buf_attr,

				  hr_dev->caps.idx_ba_pg_sz + PAGE_SHIFT,

				  hr_dev->caps.idx_ba_pg_sz + HNS_HW_PAGE_SHIFT,

				  udata, addr);

	if (ret) {

		ibdev_err(ibdev, "Failed to alloc SRQ idx mtr, ret = %d.\n", ret);