Commit 36114286 authored by Luoyouming's avatar Luoyouming Committed by Zheng Zengkai
Browse files

Revert "RDMA/hns: Support cqe inline in user space" 

driver inclusion
category: cleanup
bugzilla: https://gitee.com/openeuler/kernel/issues/I5USIG



-----------------------------------------------------------

This reverts commit 5a18385d.

Fixes: 5a18385d ("RDMA/hns: Support cqe inline in user space")

Signed-off-by: default avatarLuoyouming <luoyouming@huawei.com>
Reviewed-by: default avatarYangyang Li <liyangyang20@huawei.com>
Reviewed-by: default avatarHaoyue Xu <xuhaoyue1@hisilicon.com>
Reviewed-by: default avatarYueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent a7052c43

drivers/infiniband/hw/hns/hns_roce_device.h

+0 −1
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ enum { 
	HNS_ROCE_CAP_FLAG_DIRECT_WQE		= BIT(12),

	HNS_ROCE_CAP_FLAG_SDI_MODE		= BIT(14),

	HNS_ROCE_CAP_FLAG_STASH			= BIT(17),

	HNS_ROCE_CAP_FLAG_CQE_INLINE		= BIT(19),

	HNS_ROCE_CAP_FLAG_RQ_INLINE		= BIT(20),

};

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+0 −12
Original line number Diff line number Diff line
@@ -4726,18 +4726,6 @@ static int modify_qp_init_to_rtr(struct ib_qp *ibqp, 
		hr_reg_clear(qpc_mask, QPC_RQIE);

	}



	if (udata &&

	    (ibqp->qp_type == IB_QPT_RC || ibqp->qp_type == IB_QPT_XRC_TGT) &&

	    (uctx->config & HNS_ROCE_ALLOC_UCTX_CQE_INLINE_FLAGS)) {

		hr_reg_write_bool(context, QPC_CQEIE,

				  hr_dev->caps.flags &

				  HNS_ROCE_CAP_FLAG_CQE_INLINE);

		hr_reg_clear(qpc_mask, QPC_CQEIE);



		hr_reg_write(context, QPC_CQEIS, 0);

		hr_reg_clear(qpc_mask, QPC_CQEIS);

	}



	return 0;

}

drivers/infiniband/hw/hns/hns_roce_hw_v2.h

+1 −2
Original line number Diff line number Diff line
@@ -529,8 +529,7 @@ struct hns_roce_v2_qp_context { 
#define QPC_RQ_RTY_TX_ERR QPC_FIELD_LOC(607, 607)

#define QPC_RX_CQN QPC_FIELD_LOC(631, 608)

#define QPC_XRC_QP_TYPE QPC_FIELD_LOC(632, 632)

#define QPC_CQEIE QPC_FIELD_LOC(633, 633)

#define QPC_CQEIS QPC_FIELD_LOC(634, 634)

#define QPC_RSV3 QPC_FIELD_LOC(634, 633)

#define QPC_MIN_RNR_TIME QPC_FIELD_LOC(639, 635)

#define QPC_RQ_PRODUCER_IDX QPC_FIELD_LOC(655, 640)

#define QPC_RQ_CONSUMER_IDX QPC_FIELD_LOC(671, 656)

drivers/infiniband/hw/hns/hns_roce_main.c

+0 −4
Original line number Diff line number Diff line
@@ -383,10 +383,6 @@ static int hns_roce_alloc_ucontext(struct ib_ucontext *uctx, 
		context->config |= ucmd.config & HNS_ROCE_ALLOC_UCTX_RQ_INLINE_FLAGS;

		if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_RQ_INLINE)

			resp.config |= HNS_ROCE_ALLOC_UCTX_RQ_INLINE_FLAGS;



		context->config |= ucmd.config & HNS_ROCE_ALLOC_UCTX_CQE_INLINE_FLAGS;

		if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_CQE_INLINE)

			resp.config |= HNS_ROCE_ALLOC_UCTX_CQE_INLINE_FLAGS;

	}



	ret = hns_roce_uar_alloc(hr_dev, &context->uar);

include/uapi/rdma/hns-abi.h

+0 −1
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ struct hns_roce_ib_create_qp_resp { 
enum {

	HNS_ROCE_UCONTEXT_EXSGE_CALC_MODE = 1 << 0,

	HNS_ROCE_ALLOC_UCTX_RQ_INLINE_FLAGS = 1 << 1,

	HNS_ROCE_ALLOC_UCTX_CQE_INLINE_FLAGS = 1 << 2,

};



struct hns_roce_ib_alloc_ucontext_resp {