Commit a89e2326 authored by Chengchang Tang's avatar Chengchang Tang Committed by ZhouJuan
Browse files

RDMA/hns: Remove redundant 'phy_addr' in hns_roce_hem_list_find_mtt() 

mainline inclusion
from mainline-v6.1-rc1
commit 5f652387
category: cleanup
bugzilla: https://gitee.com/openeuler/kernel/issues/I7UVH7
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=5f652387c5423a82453c5cb446a88834bf41a94b

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

This parameter has never been used. Remove it to simplify the function.

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


Signed-off-by: default avatarChengchang Tang <tangchengchang@huawei.com>
Signed-off-by: default avatarYunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: default avatarHaoyue Xu <xuhaoyue1@hisilicon.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarJuan Zhou <zhoujuan51@h-partners.com>
parent abbac4aa

drivers/infiniband/hw/hns/hns_roce_hem.c

+1 −6
Original line number Diff line number Diff line
@@ -1479,19 +1479,17 @@ void hns_roce_hem_list_init(struct hns_roce_hem_list *hem_list) 


void *hns_roce_hem_list_find_mtt(struct hns_roce_dev *hr_dev,

				 struct hns_roce_hem_list *hem_list,

				 int offset, int *mtt_cnt, u64 *phy_addr)

				 int offset, int *mtt_cnt)

{

	struct list_head *head = &hem_list->btm_bt;

	struct hns_roce_hem_item *hem, *temp_hem;

	void *cpu_base = NULL;

	u64 phy_base = 0;

	int nr = 0;



	list_for_each_entry_safe(hem, temp_hem, head, sibling) {

		if (hem_list_page_is_in_range(hem, offset)) {

			nr = offset - hem->start;

			cpu_base = hem->addr + nr * BA_BYTE_LEN;

			phy_base = hem->dma_addr + nr * BA_BYTE_LEN;

			nr = hem->end + 1 - offset;

			break;

		}
@@ -1500,8 +1498,5 @@ void *hns_roce_hem_list_find_mtt(struct hns_roce_dev *hr_dev, 
	if (mtt_cnt)

		*mtt_cnt = nr;



	if (phy_addr)

		*phy_addr = phy_base;



	return cpu_base;

}

drivers/infiniband/hw/hns/hns_roce_hem.h

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ void hns_roce_hem_list_release(struct hns_roce_dev *hr_dev, 
			       struct hns_roce_hem_list *hem_list);

void *hns_roce_hem_list_find_mtt(struct hns_roce_dev *hr_dev,

				 struct hns_roce_hem_list *hem_list,

				 int offset, int *mtt_cnt, u64 *phy_addr);

				 int offset, int *mtt_cnt);



static inline void hns_roce_hem_first(struct hns_roce_hem *hem,

				      struct hns_roce_hem_iter *iter)

drivers/infiniband/hw/hns/hns_roce_mr.c

+2 −2
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ static int mtr_map_region(struct hns_roce_dev *hr_dev, struct hns_roce_mtr *mtr, 
	while (offset < end && npage < max_count) {

		count = 0;

		mtts = hns_roce_hem_list_find_mtt(hr_dev, &mtr->hem_list,

						  offset, &count, NULL);

						  offset, &count);

		if (!mtts)

			return -ENOBUFS;
@@ -871,7 +871,7 @@ int hns_roce_mtr_find(struct hns_roce_dev *hr_dev, struct hns_roce_mtr *mtr, 
		mtt_count = 0;

		mtts = hns_roce_hem_list_find_mtt(hr_dev, &mtr->hem_list,

						  start_index + total,

						  &mtt_count, NULL);

						  &mtt_count);

		if (!mtts || !mtt_count)

			goto done;