Commit bed65a51 authored by Chengchang Tang's avatar Chengchang Tang Committed by Juan Zhou
Browse files

RDMA/hns: Remove unused parameters and variables 

maillist inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9HASN
CVE: NA

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



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

Remove unused parameters and variables.

Signed-off-by: default avatarChengchang Tang <tangchengchang@huawei.com>
Signed-off-by: default avatarJunxian Huang <huangjunxian6@hisilicon.com>
Link: https://lore.kernel.org/r/20240412091616.370789-3-huangjunxian6@hisilicon.com


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarJuan Zhou <zhoujuan51@h-partners.com>
parent 37081aed

drivers/infiniband/hw/hns/hns_roce_alloc.c

+1 −2
Original line number Diff line number Diff line
@@ -153,8 +153,7 @@ int hns_roce_get_kmem_bufs(struct hns_roce_dev *hr_dev, dma_addr_t *bufs, 
	return total;

}



int hns_roce_get_umem_bufs(struct hns_roce_dev *hr_dev, dma_addr_t *bufs,

			   int buf_cnt, struct ib_umem *umem,

int hns_roce_get_umem_bufs(dma_addr_t *bufs, int buf_cnt, struct ib_umem *umem,

			   unsigned int page_shift)

{

	struct ib_block_iter biter;

drivers/infiniband/hw/hns/hns_roce_device.h

+2 −3
Original line number Diff line number Diff line
@@ -1021,8 +1021,7 @@ struct hns_roce_hw { 
	int (*rereg_write_mtpt)(struct hns_roce_dev *hr_dev,

				struct hns_roce_mr *mr, int flags,

				void *mb_buf);

	int (*frmr_write_mtpt)(struct hns_roce_dev *hr_dev, void *mb_buf,

			       struct hns_roce_mr *mr);

	int (*frmr_write_mtpt)(void *mb_buf, struct hns_roce_mr *mr);

	int (*mw_write_mtpt)(void *mb_buf, struct hns_roce_mw *mw);

	void (*write_cqc)(struct hns_roce_dev *hr_dev,

			  struct hns_roce_cq *hr_cq, void *mb_buf, u64 *mtts,
@@ -1389,7 +1388,7 @@ struct hns_roce_buf *hns_roce_buf_alloc(struct hns_roce_dev *hr_dev, u32 size, 
int hns_roce_get_kmem_bufs(struct hns_roce_dev *hr_dev, dma_addr_t *bufs,

			   int buf_cnt, struct hns_roce_buf *buf,

			   unsigned int page_shift);

int hns_roce_get_umem_bufs(struct hns_roce_dev *hr_dev, dma_addr_t *bufs,

int hns_roce_get_umem_bufs(dma_addr_t *bufs,

			   int buf_cnt, struct ib_umem *umem,

			   unsigned int page_shift);

drivers/infiniband/hw/hns/hns_roce_hem.c

+5 −8
Original line number Diff line number Diff line
@@ -987,15 +987,13 @@ static void hem_list_free_all(struct hns_roce_dev *hr_dev, 
	}

}



static void hem_list_link_bt(struct hns_roce_dev *hr_dev, void *base_addr,

			     u64 table_addr)

static void hem_list_link_bt(void *base_addr, u64 table_addr)

{

	*(u64 *)(base_addr) = table_addr;

}



/* assign L0 table address to hem from root bt */

static void hem_list_assign_bt(struct hns_roce_dev *hr_dev,

			       struct hns_roce_hem_item *hem, void *cpu_addr,

static void hem_list_assign_bt(struct hns_roce_hem_item *hem, void *cpu_addr,

			       u64 phy_addr)

{

	hem->addr = cpu_addr;
@@ -1164,8 +1162,7 @@ static int hem_list_alloc_mid_bt(struct hns_roce_dev *hr_dev, 
		if (level > 1) {

			pre = hem_ptrs[level - 1];

			step = (cur->start - pre->start) / step * BA_BYTE_LEN;

			hem_list_link_bt(hr_dev, pre->addr + step,

					 cur->dma_addr);

			hem_list_link_bt(pre->addr + step, cur->dma_addr);

		}

	}
@@ -1223,7 +1220,7 @@ static int alloc_fake_root_bt(struct hns_roce_dev *hr_dev, void *cpu_base, 
	if (!hem)

		return -ENOMEM;



	hem_list_assign_bt(hr_dev, hem, cpu_base, phy_base);

	hem_list_assign_bt(hem, cpu_base, phy_base);

	list_add(&hem->list, branch_head);

	list_add(&hem->sibling, leaf_head);
@@ -1246,7 +1243,7 @@ static int setup_middle_bt(struct hns_roce_dev *hr_dev, void *cpu_base, 
	/* if exist mid bt, link L1 to L0 */

	list_for_each_entry_safe(hem, temp_hem, branch_head, list) {

		offset = (hem->start - r->offset) / step * BA_BYTE_LEN;

		hem_list_link_bt(hr_dev, cpu_base + offset, hem->dma_addr);

		hem_list_link_bt(cpu_base + offset, hem->dma_addr);

		total++;

	}

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+7 −13
Original line number Diff line number Diff line
@@ -3533,8 +3533,7 @@ static int hns_roce_v2_rereg_write_mtpt(struct hns_roce_dev *hr_dev, 
	return ret;

}



static int hns_roce_v2_frmr_write_mtpt(struct hns_roce_dev *hr_dev,

				       void *mb_buf, struct hns_roce_mr *mr)

static int hns_roce_v2_frmr_write_mtpt(void *mb_buf, struct hns_roce_mr *mr)

{

	dma_addr_t pbl_ba = hns_roce_get_mtr_ba(&mr->pbl_mtr);

	struct hns_roce_v2_mpt_entry *mpt_entry;
@@ -4450,8 +4449,7 @@ static void set_access_flags(struct hns_roce_qp *hr_qp, 
}



static void set_qpc_wqe_cnt(struct hns_roce_qp *hr_qp,

			    struct hns_roce_v2_qp_context *context,

			    struct hns_roce_v2_qp_context *qpc_mask)

			    struct hns_roce_v2_qp_context *context)

{

	hr_reg_write(context, QPC_SGE_SHIFT,

		     to_hr_hem_entries_shift(hr_qp->sge.sge_cnt,
@@ -4473,7 +4471,6 @@ static inline int get_pdn(struct ib_pd *ib_pd) 
}



static void modify_qp_reset_to_init(struct ib_qp *ibqp,

				    const struct ib_qp_attr *attr,

				    struct hns_roce_v2_qp_context *context,

				    struct hns_roce_v2_qp_context *qpc_mask)

{
@@ -4492,7 +4489,7 @@ static void modify_qp_reset_to_init(struct ib_qp *ibqp, 


	hr_reg_write(context, QPC_RQWS, ilog2(hr_qp->rq.max_gs));



	set_qpc_wqe_cnt(hr_qp, context, qpc_mask);

	set_qpc_wqe_cnt(hr_qp, context);



	/* No VLAN need to set 0xFFF */

	hr_reg_write(context, QPC_VLAN_ID, 0xfff);
@@ -4533,7 +4530,6 @@ static void modify_qp_reset_to_init(struct ib_qp *ibqp, 
}



static void modify_qp_init_to_init(struct ib_qp *ibqp,

				   const struct ib_qp_attr *attr,

				   struct hns_roce_v2_qp_context *context,

				   struct hns_roce_v2_qp_context *qpc_mask)

{
@@ -4867,8 +4863,7 @@ static int modify_qp_init_to_rtr(struct ib_qp *ibqp, 
	return 0;

}



static int modify_qp_rtr_to_rts(struct ib_qp *ibqp,

				const struct ib_qp_attr *attr, int attr_mask,

static int modify_qp_rtr_to_rts(struct ib_qp *ibqp, int attr_mask,

				struct hns_roce_v2_qp_context *context,

				struct hns_roce_v2_qp_context *qpc_mask)

{
@@ -5271,15 +5266,14 @@ static int hns_roce_v2_set_abs_fields(struct ib_qp *ibqp, 


	if (cur_state == IB_QPS_RESET && new_state == IB_QPS_INIT) {

		memset(qpc_mask, 0, hr_dev->caps.qpc_sz);

		modify_qp_reset_to_init(ibqp, attr, context, qpc_mask);

		modify_qp_reset_to_init(ibqp, context, qpc_mask);

	} else if (cur_state == IB_QPS_INIT && new_state == IB_QPS_INIT) {

		modify_qp_init_to_init(ibqp, attr, context, qpc_mask);

		modify_qp_init_to_init(ibqp, context, qpc_mask);

	} else if (cur_state == IB_QPS_INIT && new_state == IB_QPS_RTR) {

		ret = modify_qp_init_to_rtr(ibqp, attr, attr_mask, context,

					    qpc_mask, udata);

	} else if (cur_state == IB_QPS_RTR && new_state == IB_QPS_RTS) {

		ret = modify_qp_rtr_to_rts(ibqp, attr, attr_mask, context,

					   qpc_mask);

		ret = modify_qp_rtr_to_rts(ibqp, attr_mask, context, qpc_mask);

	}



	return ret;

drivers/infiniband/hw/hns/hns_roce_mr.c

+2 −2
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static int hns_roce_mr_enable(struct hns_roce_dev *hr_dev, 
	if (mr->type != MR_TYPE_FRMR)

		ret = hr_dev->hw->write_mtpt(hr_dev, mailbox->buf, mr);

	else

		ret = hr_dev->hw->frmr_write_mtpt(hr_dev, mailbox->buf, mr);

		ret = hr_dev->hw->frmr_write_mtpt(mailbox->buf, mr);

	if (ret) {

		dev_err(dev, "failed to write mtpt, ret = %d.\n", ret);

		goto err_page;
@@ -769,7 +769,7 @@ static int mtr_map_bufs(struct hns_roce_dev *hr_dev, struct hns_roce_mtr *mtr) 
		return -ENOMEM;



	if (mtr->umem)

		npage = hns_roce_get_umem_bufs(hr_dev, pages, page_count,

		npage = hns_roce_get_umem_bufs(pages, page_count,

					       mtr->umem, page_shift);

	else

		npage = hns_roce_get_kmem_bufs(hr_dev, pages, page_count,