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

[ Upstream commit 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: Chengchang Tang <tangchengchang@huawei.com>
Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: Haoyue Xu <xuhaoyue1@hisilicon.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Stable-dep-of: 25655580136d ("RDMA/hns: Fix soft lockup during bt pages loop")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/infiniband/hw/hns/hns_roce_hem.c b/drivers/infiniband/hw/hns/hns_roce_hem.c
index 61ec96b3a89d5c70cdcf4beae305ff908e404550..d4169dc584ed75b02ed85b33c7b25c28d0e85cbc 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_hem.c
+++ b/drivers/infiniband/hw/hns/hns_roce_hem.c
@@ -1462,19 +1462,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;
                }
@@ -1483,8 +1481,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;
 }

diff --git a/drivers/infiniband/hw/hns/hns_roce_hem.h b/drivers/infiniband/hw/hns/hns_roce_hem.h
index 5b2162a2b8cef4bdf184790fe550208536fab67b..ecf5159aba9faa8c677fa57020adf664c48be561 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_hem.h
+++ b/drivers/infiniband/hw/hns/hns_roce_hem.h
@@ -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)

diff --git a/drivers/infiniband/hw/hns/hns_roce_mr.c b/drivers/infiniband/hw/hns/hns_roce_mr.c
index b062301258683182c6f459526f2b15e11fe23f2f..66098d25cb49e691364ff3943b5762e08c94738d 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_mr.c
+++ b/drivers/infiniband/hw/hns/hns_roce_mr.c
@@ -649,7 +649,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;
 
@@ -923,7 +923,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;