Commit 95f911d9 authored by Cheng Xu's avatar Cheng Xu Committed by Leon Romanovsky
Browse files

RDMA/erdma: Eliminate unnecessary casting for erdma_post_cmd_wait 



erdma_post_cmd_wait does not use the 'u64 *req' input parameter directly.
So it is better to define it to 'void *req', and by this we can eliminate
the casting when calling erdma_post_cmd_wait.

Signed-off-by: default avatarCheng Xu <chengyou@linux.alibaba.com>
Link: https://lore.kernel.org/r/20220909093822.33868-2-chengyou@linux.alibaba.com


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent 6dbe4a8d

drivers/infiniband/hw/erdma/erdma.h

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ void erdma_finish_cmdq_init(struct erdma_dev *dev); 
void erdma_cmdq_destroy(struct erdma_dev *dev);



void erdma_cmdq_build_reqhdr(u64 *hdr, u32 mod, u32 op);

int erdma_post_cmd_wait(struct erdma_cmdq *cmdq, u64 *req, u32 req_size,

int erdma_post_cmd_wait(struct erdma_cmdq *cmdq, void *req, u32 req_size,

			u64 *resp0, u64 *resp1);

void erdma_cmdq_completion_handler(struct erdma_cmdq *cmdq);

drivers/infiniband/hw/erdma/erdma_cmdq.c

+1 −1
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ void erdma_cmdq_build_reqhdr(u64 *hdr, u32 mod, u32 op) 
	       FIELD_PREP(ERDMA_CMD_HDR_OPCODE_MASK, op);

}



int erdma_post_cmd_wait(struct erdma_cmdq *cmdq, u64 *req, u32 req_size,

int erdma_post_cmd_wait(struct erdma_cmdq *cmdq, void *req, u32 req_size,

			u64 *resp0, u64 *resp1)

{

	struct erdma_comp_wait *comp_wait;

drivers/infiniband/hw/erdma/erdma_eq.c

+2 −5
Original line number Diff line number Diff line
@@ -229,9 +229,7 @@ static int create_eq_cmd(struct erdma_dev *dev, u32 eqn, struct erdma_eq *eq) 
	req.db_dma_addr_l = lower_32_bits(db_info_dma_addr);

	req.db_dma_addr_h = upper_32_bits(db_info_dma_addr);



	return erdma_post_cmd_wait(&dev->cmdq, (u64 *)&req,

				   sizeof(struct erdma_cmdq_create_eq_req),

				   NULL, NULL);

	return erdma_post_cmd_wait(&dev->cmdq, &req, sizeof(req), NULL, NULL);

}



static int erdma_ceq_init_one(struct erdma_dev *dev, u16 ceqn)
@@ -281,8 +279,7 @@ static void erdma_ceq_uninit_one(struct erdma_dev *dev, u16 ceqn) 
	req.qtype = ERDMA_EQ_TYPE_CEQ;

	req.vector_idx = ceqn + 1;



	err = erdma_post_cmd_wait(&dev->cmdq, (u64 *)&req, sizeof(req), NULL,

				  NULL);

	err = erdma_post_cmd_wait(&dev->cmdq, &req, sizeof(req), NULL, NULL);

	if (err)

		return;

drivers/infiniband/hw/erdma/erdma_qp.c

+2 −4
Original line number Diff line number Diff line
@@ -105,8 +105,7 @@ static int erdma_modify_qp_state_to_rts(struct erdma_qp *qp, 
		req.send_nxt += MPA_DEFAULT_HDR_LEN + qp->attrs.pd_len;

	req.recv_nxt = tp->rcv_nxt;



	return erdma_post_cmd_wait(&dev->cmdq, (u64 *)&req, sizeof(req), NULL,

				   NULL);

	return erdma_post_cmd_wait(&dev->cmdq, &req, sizeof(req), NULL, NULL);

}



static int erdma_modify_qp_state_to_stop(struct erdma_qp *qp,
@@ -124,8 +123,7 @@ static int erdma_modify_qp_state_to_stop(struct erdma_qp *qp, 
	req.cfg = FIELD_PREP(ERDMA_CMD_MODIFY_QP_STATE_MASK, attrs->state) |

		  FIELD_PREP(ERDMA_CMD_MODIFY_QP_QPN_MASK, QP_ID(qp));



	return erdma_post_cmd_wait(&dev->cmdq, (u64 *)&req, sizeof(req), NULL,

				   NULL);

	return erdma_post_cmd_wait(&dev->cmdq, &req, sizeof(req), NULL, NULL);

}



int erdma_modify_qp_internal(struct erdma_qp *qp, struct erdma_qp_attrs *attrs,

drivers/infiniband/hw/erdma/erdma_verbs.c

+6 −11
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static int create_qp_cmd(struct erdma_dev *dev, struct erdma_qp *qp) 
		req.rq_db_info_dma_addr = user_qp->rq_db_info_dma_addr;

	}



	err = erdma_post_cmd_wait(&dev->cmdq, (u64 *)&req, sizeof(req), &resp0,

	err = erdma_post_cmd_wait(&dev->cmdq, &req, sizeof(req), &resp0,

				  &resp1);

	if (!err)

		qp->attrs.cookie =
@@ -151,8 +151,7 @@ static int regmr_cmd(struct erdma_dev *dev, struct erdma_mr *mr) 
	}



post_cmd:

	return erdma_post_cmd_wait(&dev->cmdq, (u64 *)&req, sizeof(req), NULL,

				   NULL);

	return erdma_post_cmd_wait(&dev->cmdq, &req, sizeof(req), NULL, NULL);

}



static int create_cq_cmd(struct erdma_dev *dev, struct erdma_cq *cq)
@@ -202,8 +201,7 @@ static int create_cq_cmd(struct erdma_dev *dev, struct erdma_cq *cq) 
		req.cq_db_info_addr = cq->user_cq.db_info_dma_addr;

	}



	return erdma_post_cmd_wait(&dev->cmdq, (u64 *)&req, sizeof(req), NULL,

				   NULL);

	return erdma_post_cmd_wait(&dev->cmdq, &req, sizeof(req), NULL, NULL);

}



static int erdma_alloc_idx(struct erdma_resource_cb *res_cb)
@@ -976,8 +974,7 @@ int erdma_dereg_mr(struct ib_mr *ibmr, struct ib_udata *udata) 
	req.cfg = FIELD_PREP(ERDMA_CMD_MR_MPT_IDX_MASK, ibmr->lkey >> 8) |

		  FIELD_PREP(ERDMA_CMD_MR_KEY_MASK, ibmr->lkey & 0xFF);



	ret = erdma_post_cmd_wait(&dev->cmdq, (u64 *)&req, sizeof(req), NULL,

				  NULL);

	ret = erdma_post_cmd_wait(&dev->cmdq, &req, sizeof(req), NULL, NULL);

	if (ret)

		return ret;
@@ -1002,8 +999,7 @@ int erdma_destroy_cq(struct ib_cq *ibcq, struct ib_udata *udata) 
				CMDQ_OPCODE_DESTROY_CQ);

	req.cqn = cq->cqn;



	err = erdma_post_cmd_wait(&dev->cmdq, (u64 *)&req, sizeof(req), NULL,

				  NULL);

	err = erdma_post_cmd_wait(&dev->cmdq, &req, sizeof(req), NULL, NULL);

	if (err)

		return err;
@@ -1040,8 +1036,7 @@ int erdma_destroy_qp(struct ib_qp *ibqp, struct ib_udata *udata) 
				CMDQ_OPCODE_DESTROY_QP);

	req.qpn = QP_ID(qp);



	err = erdma_post_cmd_wait(&dev->cmdq, (u64 *)&req, sizeof(req), NULL,

				  NULL);

	err = erdma_post_cmd_wait(&dev->cmdq, &req, sizeof(req), NULL, NULL);

	if (err)

		return err;