On Fri, Sep 09, 2016 at 06:30:51PM +0800, Salil Mehta wrote: > From: Lijun Ou <oulijun@xxxxxxxxxx> > > It doesn't need to assign for the filed of qp state in qpc separately > when qp happen to migrate state which supported in RoCE engine v1. > > Signed-off-by: Lijun Ou <oulijun@xxxxxxxxxx> > Reviewed-by: Wei Hu (Xavier) <xavier.huwei@xxxxxxxxxx> > Signed-off-by: Salil Mehta <salil.mehta@xxxxxxxxxx> > --- > drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 14 +++----------- > 1 file changed, 3 insertions(+), 11 deletions(-) > > diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v1.c b/drivers/infiniband/hw/hns/hns_roce_hw_v1.c > index 7a61d7e..3bc32fc 100644 > --- a/drivers/infiniband/hw/hns/hns_roce_hw_v1.c > +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v1.c > @@ -2405,11 +2405,6 @@ static int hns_roce_v1_m_qp(struct ib_qp *ibqp, const struct ib_qp_attr *attr, > roce_set_bit(context->qpc_bytes_140, > QP_CONTEXT_QPC_BYTES_140_RNR_RETRY_FLG_S, 0); > > - roce_set_field(context->qpc_bytes_144, > - QP_CONTEXT_QPC_BYTES_144_QP_STATE_M, > - QP_CONTEXT_QPC_BYTES_144_QP_STATE_S, > - attr->qp_state); > - > roce_set_field(context->qpc_bytes_148, > QP_CONTEXT_QPC_BYTES_148_CHECK_FLAG_M, > QP_CONTEXT_QPC_BYTES_148_CHECK_FLAG_S, 0); > @@ -2524,13 +2519,10 @@ static int hns_roce_v1_m_qp(struct ib_qp *ibqp, const struct ib_qp_attr *attr, > (cur_state == IB_QPS_RTS && new_state == IB_QPS_ERR) || > (cur_state == IB_QPS_ERR && new_state == IB_QPS_RESET) || > (cur_state == IB_QPS_ERR && new_state == IB_QPS_ERR)) { > - roce_set_field(context->qpc_bytes_144, > - QP_CONTEXT_QPC_BYTES_144_QP_STATE_M, > - QP_CONTEXT_QPC_BYTES_144_QP_STATE_S, > - attr->qp_state); > - > + /* It will not do additional options in engine v1 */ > + ; It will leave empty if() {..}, it is worth to rewrite to have one if for error path only. > } else { > - dev_err(dev, "not support this modify\n"); > + dev_err(dev, "not support this status migration\n"); > goto out; > } > > -- > 1.7.9.5 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html
Attachment:
signature.asc
Description: PGP signature