Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0680efa2 authored by Alex Vesker's avatar Alex Vesker Committed by Doug Ledford
Browse files

IB/mlx5: Refactor raw packet QP modify function 



Added a struct for modifying raw QP, this will allow modifying
multiple parameters in raw packet QP RQ and can also be used for
SQ in the future.

Signed-off-by: default avatarAlex Vesker <valex@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 31f69a82

drivers/infiniband/hw/mlx5/qp.c

+20 −8
Original line number Diff line number Diff line
@@ -77,6 +77,10 @@ struct mlx5_wqe_eth_pad { 
	u8 rsvd0[16];

};



struct mlx5_modify_raw_qp_param {

	u16 operation;

};



static void get_cqs(enum ib_qp_type qp_type,

		    struct ib_cq *ib_send_cq, struct ib_cq *ib_recv_cq,

		    struct mlx5_ib_cq **send_cq, struct mlx5_ib_cq **recv_cq);
@@ -1862,7 +1866,7 @@ static void get_cqs(enum ib_qp_type qp_type, 
}



static int modify_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,

				u16 operation);

				const struct mlx5_modify_raw_qp_param *raw_qp_param);



static void destroy_qp_common(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp)

{
@@ -1887,8 +1891,11 @@ static void destroy_qp_common(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp) 
						  MLX5_CMD_OP_2RST_QP, 0,

						  NULL, &base->mqp);

		} else {

			err = modify_raw_packet_qp(dev, qp,

						   MLX5_CMD_OP_2RST_QP);

			struct mlx5_modify_raw_qp_param raw_qp_param = {

				.operation = MLX5_CMD_OP_2RST_QP

			};



			err = modify_raw_packet_qp(dev, qp, &raw_qp_param);

		}

		if (err)

			mlx5_ib_warn(dev, "mlx5_ib: modify QP 0x%06x to RESET failed\n",
@@ -2421,7 +2428,7 @@ static int modify_raw_packet_qp_sq(struct mlx5_core_dev *dev, 
}



static int modify_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,

				u16 operation)

				const struct mlx5_modify_raw_qp_param *raw_qp_param)

{

	struct mlx5_ib_raw_packet_qp *raw_packet_qp = &qp->raw_packet_qp;

	struct mlx5_ib_rq *rq = &raw_packet_qp->rq;
@@ -2430,7 +2437,7 @@ static int modify_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp, 
	int sq_state;

	int err;



	switch (operation) {

	switch (raw_qp_param->operation) {

	case MLX5_CMD_OP_RST2INIT_QP:

		rq_state = MLX5_RQC_STATE_RDY;

		sq_state = MLX5_SQC_STATE_RDY;
@@ -2689,11 +2696,16 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp, 
	optpar = ib_mask_to_mlx5_opt(attr_mask);

	optpar &= opt_mask[mlx5_cur][mlx5_new][mlx5_st];



	if (qp->ibqp.qp_type == IB_QPT_RAW_PACKET)

		err = modify_raw_packet_qp(dev, qp, op);

	else

	if (qp->ibqp.qp_type == IB_QPT_RAW_PACKET) {

		struct mlx5_modify_raw_qp_param raw_qp_param = {};



		raw_qp_param.operation = op;

		err = modify_raw_packet_qp(dev, qp, &raw_qp_param);

	} else {

		err = mlx5_core_qp_modify(dev->mdev, op, optpar, context,

					  &base->mqp);

	}



	if (err)

		goto out;