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

Commit 0df67030 authored by Dotan Barak's avatar Dotan Barak Committed by Roland Dreier
Browse files

IB/mlx4: Update QP state if query QP succeeds 



If the QP was moved to another state (such as SQE) by the hardware,
then after this change the user won't have to set the IBV_QP_CUR_STATE
mask in order to execute modify QP in order to recover from this state.

Signed-off-by: default avatarDotan Barak <dotanb@dev.mellanox.co.il>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 5121df3a

drivers/infiniband/hw/mlx4/qp.c

+12 −5
Original line number Original line Diff line number Diff line
@@ -1785,7 +1785,9 @@ int mlx4_ib_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr, int qp_attr 
	struct mlx4_ib_qp *qp = to_mqp(ibqp);

	struct mlx4_ib_qp *qp = to_mqp(ibqp);

	struct mlx4_qp_context context;

	struct mlx4_qp_context context;

	int mlx4_state;

	int mlx4_state;

	int err;

	int err = 0;



	mutex_lock(&qp->mutex);





	if (qp->state == IB_QPS_RESET) {

	if (qp->state == IB_QPS_RESET) {

		qp_attr->qp_state = IB_QPS_RESET;

		qp_attr->qp_state = IB_QPS_RESET;
@@ -1793,12 +1795,15 @@ int mlx4_ib_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr, int qp_attr 
	}

	}





	err = mlx4_qp_query(dev->dev, &qp->mqp, &context);

	err = mlx4_qp_query(dev->dev, &qp->mqp, &context);

	if (err)

	if (err) {

		return -EINVAL;

		err = -EINVAL;

		goto out;

	}





	mlx4_state = be32_to_cpu(context.flags) >> 28;

	mlx4_state = be32_to_cpu(context.flags) >> 28;





	qp_attr->qp_state	     = to_ib_qp_state(mlx4_state);

	qp->state		     = to_ib_qp_state(mlx4_state);

	qp_attr->qp_state	     = qp->state;

	qp_attr->path_mtu	     = context.mtu_msgmax >> 5;

	qp_attr->path_mtu	     = context.mtu_msgmax >> 5;

	qp_attr->path_mig_state	     =

	qp_attr->path_mig_state	     =

		to_ib_mig_state((be32_to_cpu(context.flags) >> 11) & 0x3);

		to_ib_mig_state((be32_to_cpu(context.flags) >> 11) & 0x3);
@@ -1857,6 +1862,8 @@ int mlx4_ib_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr, int qp_attr 




	qp_init_attr->cap	     = qp_attr->cap;

	qp_init_attr->cap	     = qp_attr->cap;





	return 0;

out:

	mutex_unlock(&qp->mutex);

	return err;

}

}