Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db270c41 authored by Wei Hu\(Xavier\)'s avatar Wei Hu\(Xavier\) Committed by Jason Gunthorpe
Browse files

RDMA/hns: Fix the issue of IOVA not page continuous in hip08 



If the smmu is enabled, the length of sg obtained from
__iommu_map_sg_attrs is not 4kB. When the IOVA is set with the sg
dma address, the IOVA will not be page continuous. so, the current
code has MTPT configuration error that probably cause dma operation
failure. In order to fix this issue, the IOVA should be calculated
based on the sg length.

Fixes: 3958cc56("RDMA/hns: Configure the MTPT in hip08")
Signed-off-by: default avatarWei Hu (Xavier) <xavier.huwei@huawei.com>
Signed-off-by: default avatarShaobo Xu <xushaobo2@huawei.com>
Signed-off-by: default avatarLijun Ou <oulijun@huawei.com>
Signed-off-by: default avatarYixian Liu <liuyixian@huawei.com>
Signed-off-by: default avatarXiping Zhang (Francis) <zhangxiping3@huawei.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent a9cd1a67

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+15 −7
Original line number Diff line number Diff line
@@ -1126,9 +1126,11 @@ static int hns_roce_v2_write_mtpt(void *mb_buf, struct hns_roce_mr *mr, 
{

	struct hns_roce_v2_mpt_entry *mpt_entry;

	struct scatterlist *sg;

	u64 page_addr;

	u64 *pages;

	int i, j;

	int len;

	int entry;

	int i;



	mpt_entry = mb_buf;

	memset(mpt_entry, 0, sizeof(*mpt_entry));
@@ -1186,14 +1188,20 @@ static int hns_roce_v2_write_mtpt(void *mb_buf, struct hns_roce_mr *mr, 


	i = 0;

	for_each_sg(mr->umem->sg_head.sgl, sg, mr->umem->nmap, entry) {

		pages[i] = ((u64)sg_dma_address(sg)) >> 6;

		len = sg_dma_len(sg) >> PAGE_SHIFT;

		for (j = 0; j < len; ++j) {

			page_addr = sg_dma_address(sg) +

				    (j << mr->umem->page_shift);

			pages[i] = page_addr >> 6;



			/* Record the first 2 entry directly to MTPT table */

			if (i >= HNS_ROCE_V2_MAX_INNER_MTPT_NUM - 1)

			break;

				goto found;

			i++;

		}

	}



found:

	mpt_entry->pa0_l = cpu_to_le32(lower_32_bits(pages[0]));

	roce_set_field(mpt_entry->byte_56_pa0_h, V2_MPT_BYTE_56_PA0_H_M,

		       V2_MPT_BYTE_56_PA0_H_S,