diff --git a/drivers/infiniband/hw/hns/hns_roce_device.h b/drivers/infiniband/hw/hns/hns_roce_device.h
index 218d66166b0502faeba74e3a5537c137e16762c6..ab052b54e206661f299d7c33da4ce6dce0b26da2 100644
--- a/drivers/infiniband/hw/hns/hns_roce_device.h
+++ b/drivers/infiniband/hw/hns/hns_roce_device.h
@@ -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),
 };
 
diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
index 820a0c496c544fe789a364199fa0ce232a17add0..c9309b8addd8e0b863a5fb14fe437c44d4f0bb0a 100644
--- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
+++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
@@ -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;
 }
 
diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.h b/drivers/infiniband/hw/hns/hns_roce_hw_v2.h
index dbb19fe680c9ec1ca51b6d7c044dfef19e45b4fb..16437df320ea64c7f223d2c132ce1e58688395ac 100644
--- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.h
+++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.h
@@ -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)
diff --git a/drivers/infiniband/hw/hns/hns_roce_main.c b/drivers/infiniband/hw/hns/hns_roce_main.c
index 2d59e0bebf98830d5bccae2c5ca2135f0b2c68ce..0b04eb196fa2851810fbf44627a9355c0324a82e 100644
--- a/drivers/infiniband/hw/hns/hns_roce_main.c
+++ b/drivers/infiniband/hw/hns/hns_roce_main.c
@@ -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);
diff --git a/include/uapi/rdma/hns-abi.h b/include/uapi/rdma/hns-abi.h
index 7d09da8d99ce73f440a6c3bdcd9c36492902a410..90d1c3629b7b18c79a6db32a4913ebeb6964ad08 100644
--- a/include/uapi/rdma/hns-abi.h
+++ b/include/uapi/rdma/hns-abi.h
@@ -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 {