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

Commit b6dd9b34 authored by oulijun's avatar oulijun Committed by Doug Ledford
Browse files

RDMA/hns: Only assign dqpn if IB_QP_PATH_DEST_QPN bit is set 



Only when the IB_QP_PATH_DEST_QPN flag of attr_mask is set
is it valid to assign the dqpn field of qp context

Signed-off-by: default avatarLijun Ou <oulijun@huawei.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 734f3863

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+12 −8
Original line number Diff line number Diff line
@@ -2597,10 +2597,12 @@ static void modify_qp_init_to_init(struct ib_qp *ibqp, 
	roce_set_field(qpc_mask->byte_4_sqpn_tst, V2_QPC_BYTE_4_SQPN_M,

		       V2_QPC_BYTE_4_SQPN_S, 0);



	if (attr_mask & IB_QP_DEST_QPN) {

		roce_set_field(context->byte_56_dqpn_err, V2_QPC_BYTE_56_DQPN_M,

			       V2_QPC_BYTE_56_DQPN_S, hr_qp->qpn);

	roce_set_field(qpc_mask->byte_56_dqpn_err, V2_QPC_BYTE_56_DQPN_M,

		       V2_QPC_BYTE_56_DQPN_S, 0);

		roce_set_field(qpc_mask->byte_56_dqpn_err,

			       V2_QPC_BYTE_56_DQPN_M, V2_QPC_BYTE_56_DQPN_S, 0);

	}

	roce_set_field(context->byte_168_irrl_idx,

		       V2_QPC_BYTE_168_SQ_SHIFT_BAK_M,

		       V2_QPC_BYTE_168_SQ_SHIFT_BAK_S,
@@ -2804,10 +2806,12 @@ static int modify_qp_init_to_rtr(struct ib_qp *ibqp, 
			       V2_QPC_BYTE_140_RR_MAX_S, 0);

	}



	if (attr_mask & IB_QP_DEST_QPN) {

		roce_set_field(context->byte_56_dqpn_err, V2_QPC_BYTE_56_DQPN_M,

			       V2_QPC_BYTE_56_DQPN_S, attr->dest_qp_num);

	roce_set_field(qpc_mask->byte_56_dqpn_err, V2_QPC_BYTE_56_DQPN_M,

		       V2_QPC_BYTE_56_DQPN_S, 0);

		roce_set_field(qpc_mask->byte_56_dqpn_err,

			       V2_QPC_BYTE_56_DQPN_M, V2_QPC_BYTE_56_DQPN_S, 0);

	}



	/* Configure GID index */

	port_num = rdma_ah_get_port_num(&attr->ah_attr);