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

Commit 7c27f358 authored by Roland Dreier's avatar Roland Dreier
Browse files

IB/mlx4: Remove extra code for RESET->ERR QP state transition 



Commit 65adfa91 ("IB/mlx4: Fix RESET to RESET and RESET to ERROR
transitions") added some extra code to handle a QP state transition
from RESET to ERROR.  However, the latest 1.2.1 version of the IB spec
has clarified that this transition is actually not allowed, so we can
remove this extra code again.

Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent d3809ad0

drivers/infiniband/hw/mlx4/qp.c

+0 −26
Original line number Diff line number Diff line
@@ -1132,23 +1132,6 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp, 
	return err;

}



static const struct ib_qp_attr mlx4_ib_qp_attr = { .port_num = 1 };

static const int mlx4_ib_qp_attr_mask_table[IB_QPT_UD + 1] = {

		[IB_QPT_UD]  = (IB_QP_PKEY_INDEX		|

				IB_QP_PORT			|

				IB_QP_QKEY),

		[IB_QPT_UC]  = (IB_QP_PKEY_INDEX		|

				IB_QP_PORT			|

				IB_QP_ACCESS_FLAGS),

		[IB_QPT_RC]  = (IB_QP_PKEY_INDEX		|

				IB_QP_PORT			|

				IB_QP_ACCESS_FLAGS),

		[IB_QPT_SMI] = (IB_QP_PKEY_INDEX		|

				IB_QP_QKEY),

		[IB_QPT_GSI] = (IB_QP_PKEY_INDEX		|

				IB_QP_QKEY),

};



int mlx4_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,

		      int attr_mask, struct ib_udata *udata)

{
@@ -1191,15 +1174,6 @@ int mlx4_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, 
		goto out;

	}



	if (cur_state == IB_QPS_RESET && new_state == IB_QPS_ERR) {

		err = __mlx4_ib_modify_qp(ibqp, &mlx4_ib_qp_attr,

					  mlx4_ib_qp_attr_mask_table[ibqp->qp_type],

					  IB_QPS_RESET, IB_QPS_INIT);

		if (err)

			goto out;

		cur_state = IB_QPS_INIT;

	}



	err = __mlx4_ib_modify_qp(ibqp, attr, attr_mask, cur_state, new_state);



out: