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

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

IB/mthca: Don't execute QUERY_QP firmware command for QP in RESET state 



If a QP being queried is in the RESET state, don't execute the
QUERY_QP firmware command (because it will fail).

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

drivers/infiniband/hw/mthca/mthca_qp.c

+17 −9
Original line number Diff line number Diff line
@@ -429,13 +429,18 @@ int mthca_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr, int qp_attr_m 
{

	struct mthca_dev *dev = to_mdev(ibqp->device);

	struct mthca_qp *qp = to_mqp(ibqp);

	int err;

	struct mthca_mailbox *mailbox;

	int err = 0;

	struct mthca_mailbox *mailbox = NULL;

	struct mthca_qp_param *qp_param;

	struct mthca_qp_context *context;

	int mthca_state;

	u8 status;



	if (qp->state == IB_QPS_RESET) {

		qp_attr->qp_state = IB_QPS_RESET;

		goto done;

	}



	mailbox = mthca_alloc_mailbox(dev, GFP_KERNEL);

	if (IS_ERR(mailbox))

		return PTR_ERR(mailbox);
@@ -454,7 +459,6 @@ int mthca_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr, int qp_attr_m 
	mthca_state = be32_to_cpu(context->flags) >> 28;



	qp_attr->qp_state 	     = to_ib_qp_state(mthca_state);

	qp_attr->cur_qp_state 	     = qp_attr->qp_state;

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

	qp_attr->path_mig_state      =

		to_ib_mig_state((be32_to_cpu(context->flags) >> 11) & 0x3);
@@ -464,11 +468,6 @@ int mthca_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr, int qp_attr_m 
	qp_attr->dest_qp_num 	     = be32_to_cpu(context->remote_qpn) & 0xffffff;

	qp_attr->qp_access_flags     =

		to_ib_qp_access_flags(be32_to_cpu(context->params2));

	qp_attr->cap.max_send_wr     = qp->sq.max;

	qp_attr->cap.max_recv_wr     = qp->rq.max;

	qp_attr->cap.max_send_sge    = qp->sq.max_gs;

	qp_attr->cap.max_recv_sge    = qp->rq.max_gs;

	qp_attr->cap.max_inline_data = qp->max_inline_data;



	if (qp->transport == RC || qp->transport == UC) {

		to_ib_ah_attr(dev, &qp_attr->ah_attr, &context->pri_path);
@@ -495,6 +494,15 @@ int mthca_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr, int qp_attr_m 
	qp_attr->retry_cnt 	    = (be32_to_cpu(context->params1) >> 16) & 0x7;

	qp_attr->rnr_retry 	    = context->pri_path.rnr_retry >> 5;

	qp_attr->alt_timeout 	    = context->alt_path.ackto >> 3;



done:

	qp_attr->cur_qp_state	     = qp_attr->qp_state;

	qp_attr->cap.max_send_wr     = qp->sq.max;

	qp_attr->cap.max_recv_wr     = qp->rq.max;

	qp_attr->cap.max_send_sge    = qp->sq.max_gs;

	qp_attr->cap.max_recv_sge    = qp->rq.max_gs;

	qp_attr->cap.max_inline_data = qp->max_inline_data;



	qp_init_attr->cap	     = qp_attr->cap;



out: