Commit eaaa98de authored by Weihang Li's avatar Weihang Li Committed by Jason Gunthorpe
Browse files

RDMA/hns: Remove redundant parameters in set_rc_wqe() 

There are some functions called by set_rc_wqe() use two parameters:
"void *wqe" and "struct hns_roce_v2_rc_send_wqe *rc_sq_wqe", but the first
one can be got from the second one. So remove the redundant wqe from
related functions.

Link: https://lore.kernel.org/r/1595932941-40613-5-git-send-email-liweihang@huawei.com


Signed-off-by: default avatarWeihang Li <liweihang@huawei.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent a247fd28

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+17 −13
Original line number Diff line number Diff line
@@ -91,10 +91,11 @@ static u32 to_hr_opcode(u32 ib_opcode) 
}



static void set_frmr_seg(struct hns_roce_v2_rc_send_wqe *rc_sq_wqe,

			 void *wqe, const struct ib_reg_wr *wr)

			 const struct ib_reg_wr *wr)

{

	struct hns_roce_wqe_frmr_seg *fseg =

		(void *)rc_sq_wqe + sizeof(struct hns_roce_v2_rc_send_wqe);

	struct hns_roce_mr *mr = to_hr_mr(wr->mr);

	struct hns_roce_wqe_frmr_seg *fseg = wqe;

	u64 pbl_ba;



	/* use ib_access_flags */
@@ -128,14 +129,16 @@ static void set_frmr_seg(struct hns_roce_v2_rc_send_wqe *rc_sq_wqe, 
		     V2_RC_FRMR_WQE_BYTE_40_BLK_MODE_S, 0);

}



static void set_atomic_seg(const struct ib_send_wr *wr, void *wqe,

static void set_atomic_seg(const struct ib_send_wr *wr,

			   struct hns_roce_v2_rc_send_wqe *rc_sq_wqe,

			   unsigned int valid_num_sge)

{

	struct hns_roce_wqe_atomic_seg *aseg;

	struct hns_roce_v2_wqe_data_seg *dseg =

		(void *)rc_sq_wqe + sizeof(struct hns_roce_v2_rc_send_wqe);

	struct hns_roce_wqe_atomic_seg *aseg =

		(void *)dseg + sizeof(struct hns_roce_v2_wqe_data_seg);



	set_data_seg_v2(wqe, wr->sg_list);

	aseg = wqe + sizeof(struct hns_roce_v2_wqe_data_seg);

	set_data_seg_v2(dseg, wr->sg_list);



	if (wr->opcode == IB_WR_ATOMIC_CMP_AND_SWP) {

		aseg->fetchadd_swap_data = cpu_to_le64(atomic_wr(wr)->swap);
@@ -176,13 +179,15 @@ static void set_extend_sge(struct hns_roce_qp *qp, const struct ib_send_wr *wr, 


static int set_rwqe_data_seg(struct ib_qp *ibqp, const struct ib_send_wr *wr,

			     struct hns_roce_v2_rc_send_wqe *rc_sq_wqe,

			     void *wqe, unsigned int *sge_ind,

			     unsigned int *sge_ind,

			     unsigned int valid_num_sge)

{

	struct hns_roce_dev *hr_dev = to_hr_dev(ibqp->device);

	struct hns_roce_v2_wqe_data_seg *dseg = wqe;

	struct hns_roce_v2_wqe_data_seg *dseg =

		(void *)rc_sq_wqe + sizeof(struct hns_roce_v2_rc_send_wqe);

	struct ib_device *ibdev = &hr_dev->ib_dev;

	struct hns_roce_qp *qp = to_hr_qp(ibqp);

	void *wqe = dseg;

	int j = 0;

	int i;
@@ -438,7 +443,6 @@ static inline int set_rc_wqe(struct hns_roce_qp *qp, 
	roce_set_bit(rc_sq_wqe->byte_4, V2_RC_SEND_WQE_BYTE_4_OWNER_S,

		     owner_bit);



	wqe += sizeof(struct hns_roce_v2_rc_send_wqe);

	switch (wr->opcode) {

	case IB_WR_RDMA_READ:

	case IB_WR_RDMA_WRITE:
@@ -451,7 +455,7 @@ static inline int set_rc_wqe(struct hns_roce_qp *qp, 
		rc_sq_wqe->inv_key = cpu_to_le32(wr->ex.invalidate_rkey);

		break;

	case IB_WR_REG_MR:

		set_frmr_seg(rc_sq_wqe, wqe, reg_wr(wr));

		set_frmr_seg(rc_sq_wqe, reg_wr(wr));

		break;

	case IB_WR_ATOMIC_CMP_AND_SWP:

	case IB_WR_ATOMIC_FETCH_AND_ADD:
@@ -468,10 +472,10 @@ static inline int set_rc_wqe(struct hns_roce_qp *qp, 


	if (wr->opcode == IB_WR_ATOMIC_CMP_AND_SWP ||

	    wr->opcode == IB_WR_ATOMIC_FETCH_AND_ADD)

		set_atomic_seg(wr, wqe, rc_sq_wqe, valid_num_sge);

		set_atomic_seg(wr, rc_sq_wqe, valid_num_sge);

	else if (wr->opcode != IB_WR_REG_MR)

		ret = set_rwqe_data_seg(&qp->ibqp, wr, rc_sq_wqe,

					wqe, &curr_idx, valid_num_sge);

					&curr_idx, valid_num_sge);



	*sge_idx = curr_idx;

CRA Git | Maintained and supported by SUSTech CRA and CCSE