Commit 29b52027 authored by Yixian Liu's avatar Yixian Liu Committed by Jason Gunthorpe
Browse files

RDMA/hns: Remove unnecessary access right set during INIT2INIT 

As the qp access right is checked and setted in common function
hns_roce_v2_set_opt_fields(), there is no need to set again for a special
case INIT2INIT.

Fixes: 926a01dc ("RDMA/hns: Add QP operations support for hip08 SoC")
Fixes: 7db82697 ("RDMA/hns: Add support for extended atomic in userspace")
Link: https://lore.kernel.org/r/1607650657-35992-7-git-send-email-liweihang@huawei.com


Signed-off-by: default avatarYixian Liu <liuyixian@huawei.com>
Signed-off-by: default avatarWeihang Li <liweihang@huawei.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent f7550683

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+0 −46
Original line number Diff line number Diff line
@@ -3975,7 +3975,6 @@ static void modify_qp_reset_to_init(struct ib_qp *ibqp, 


	roce_set_bit(context->byte_172_sq_psn, V2_QPC_BYTE_172_FRE_S, 1);



	hr_qp->access_flags = attr->qp_access_flags;

	roce_set_field(context->byte_252_err_txcqn, V2_QPC_BYTE_252_TX_CQN_M,

		       V2_QPC_BYTE_252_TX_CQN_S, to_hr_cq(ibqp->send_cq)->cqn);
@@ -4004,51 +4003,6 @@ static void modify_qp_init_to_init(struct ib_qp *ibqp, 
	roce_set_field(qpc_mask->byte_4_sqpn_tst, V2_QPC_BYTE_4_TST_M,

		       V2_QPC_BYTE_4_TST_S, 0);



	if (attr_mask & IB_QP_ACCESS_FLAGS) {

		roce_set_bit(context->byte_76_srqn_op_en, V2_QPC_BYTE_76_RRE_S,

			     !!(attr->qp_access_flags & IB_ACCESS_REMOTE_READ));

		roce_set_bit(qpc_mask->byte_76_srqn_op_en, V2_QPC_BYTE_76_RRE_S,

			     0);



		roce_set_bit(context->byte_76_srqn_op_en, V2_QPC_BYTE_76_RWE_S,

			     !!(attr->qp_access_flags &

			     IB_ACCESS_REMOTE_WRITE));

		roce_set_bit(qpc_mask->byte_76_srqn_op_en, V2_QPC_BYTE_76_RWE_S,

			     0);



		roce_set_bit(context->byte_76_srqn_op_en, V2_QPC_BYTE_76_ATE_S,

			     !!(attr->qp_access_flags &

			     IB_ACCESS_REMOTE_ATOMIC));

		roce_set_bit(qpc_mask->byte_76_srqn_op_en, V2_QPC_BYTE_76_ATE_S,

			     0);

		roce_set_bit(context->byte_76_srqn_op_en,

			     V2_QPC_BYTE_76_EXT_ATE_S,

			     !!(attr->qp_access_flags &

				IB_ACCESS_REMOTE_ATOMIC));

		roce_set_bit(qpc_mask->byte_76_srqn_op_en,

			     V2_QPC_BYTE_76_EXT_ATE_S, 0);

	} else {

		roce_set_bit(context->byte_76_srqn_op_en, V2_QPC_BYTE_76_RRE_S,

			     !!(hr_qp->access_flags & IB_ACCESS_REMOTE_READ));

		roce_set_bit(qpc_mask->byte_76_srqn_op_en, V2_QPC_BYTE_76_RRE_S,

			     0);



		roce_set_bit(context->byte_76_srqn_op_en, V2_QPC_BYTE_76_RWE_S,

			     !!(hr_qp->access_flags & IB_ACCESS_REMOTE_WRITE));

		roce_set_bit(qpc_mask->byte_76_srqn_op_en, V2_QPC_BYTE_76_RWE_S,

			     0);



		roce_set_bit(context->byte_76_srqn_op_en, V2_QPC_BYTE_76_ATE_S,

			     !!(hr_qp->access_flags & IB_ACCESS_REMOTE_ATOMIC));

		roce_set_bit(qpc_mask->byte_76_srqn_op_en, V2_QPC_BYTE_76_ATE_S,

			     0);

		roce_set_bit(context->byte_76_srqn_op_en,

			     V2_QPC_BYTE_76_EXT_ATE_S,

			     !!(hr_qp->access_flags & IB_ACCESS_REMOTE_ATOMIC));

		roce_set_bit(qpc_mask->byte_76_srqn_op_en,

			     V2_QPC_BYTE_76_EXT_ATE_S, 0);

	}



	roce_set_field(context->byte_16_buf_ba_pg_sz, V2_QPC_BYTE_16_PD_M,

		       V2_QPC_BYTE_16_PD_S, to_hr_pd(ibqp->pd)->pdn);

	roce_set_field(qpc_mask->byte_16_buf_ba_pg_sz, V2_QPC_BYTE_16_PD_M,

CRA Git | Maintained and supported by SUSTech CRA and CCSE