[PATCH v2 07/18] net/dpaa: add support to separate Tx conf queues

[Hemant Agrawal <hemant.agrawal@nxp.com>]

From: Vanshika Shukla <vanshika.shukla@nxp.com>

This patch separates Tx confirmation queues for kernel
and DPDK so as to support the VSP case.

Signed-off-by: Vanshika Shukla <vanshika.shukla@nxp.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 drivers/bus/dpaa/include/fsl_qman.h |  4 ++-
 drivers/net/dpaa/dpaa_ethdev.c      | 45 +++++++++++++++++++++--------
 drivers/net/dpaa/dpaa_rxtx.c        |  3 +-
 3 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/drivers/bus/dpaa/include/fsl_qman.h b/drivers/bus/dpaa/include/fsl_qman.h
index c0677976e8..db14dfb839 100644
--- a/drivers/bus/dpaa/include/fsl_qman.h
+++ b/drivers/bus/dpaa/include/fsl_qman.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0)
  *
  * Copyright 2008-2012 Freescale Semiconductor, Inc.
- * Copyright 2019 NXP
+ * Copyright 2019-2022 NXP
  *
  */
 
@@ -1237,6 +1237,8 @@ struct qman_fq {
 
 	/* DPDK Interface */
 	void *dpaa_intf;
+	/*to store tx_conf_queue corresponding to tx_queue*/
+	struct qman_fq *tx_conf_queue;
 
 	struct rte_event ev;
 	/* affined portal in case of static queue */
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index bba305cfb1..3ee3029729 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -1870,9 +1870,30 @@ static int dpaa_tx_queue_init(struct qman_fq *fq,
 	return ret;
 }
 
-/* Initialise a DEBUG FQ ([rt]x_error, rx_default) and DPAA TX CONFIRM queue
- * to support PTP
- */
+static int
+dpaa_tx_conf_queue_init(struct qman_fq *fq)
+{
+	struct qm_mcc_initfq opts = {0};
+	int ret;
+
+	PMD_INIT_FUNC_TRACE();
+
+	ret = qman_create_fq(0, QMAN_FQ_FLAG_DYNAMIC_FQID, fq);
+	if (ret) {
+		DPAA_PMD_ERR("create Tx_conf failed with ret: %d", ret);
+		return ret;
+	}
+
+	opts.we_mask = QM_INITFQ_WE_DESTWQ | QM_INITFQ_WE_FQCTRL;
+	opts.fqd.dest.wq = DPAA_IF_DEBUG_PRIORITY;
+	ret = qman_init_fq(fq, 0, &opts);
+	if (ret)
+		DPAA_PMD_ERR("init Tx_conf fqid %d failed with ret: %d",
+			fq->fqid, ret);
+	return ret;
+}
+
+/* Initialise a DEBUG FQ ([rt]x_error, rx_default) */
 static int dpaa_def_queue_init(struct qman_fq *fq, uint32_t fqid)
 {
 	struct qm_mcc_initfq opts = {0};
@@ -2170,6 +2191,15 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
 		if (ret)
 			goto free_tx;
 		dpaa_intf->tx_queues[loop].dpaa_intf = dpaa_intf;
+
+		if (dpaa_ieee_1588) {
+			ret = dpaa_tx_conf_queue_init(&dpaa_intf->tx_conf_queues[loop]);
+			if (ret)
+				goto free_tx;
+
+			dpaa_intf->tx_conf_queues[loop].dpaa_intf = dpaa_intf;
+			dpaa_intf->tx_queues[loop].tx_conf_queue = &dpaa_intf->tx_conf_queues[loop];
+		}
 	}
 	dpaa_intf->nb_tx_queues = MAX_DPAA_CORES;
 
@@ -2190,16 +2220,7 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
 			DPAA_PMD_ERR("DPAA TX ERROR queue init failed!");
 			goto free_tx;
 		}
-		dpaa_intf->debug_queues[DPAA_DEBUG_FQ_TX_ERROR].dpaa_intf = dpaa_intf;
-		ret = dpaa_def_queue_init(dpaa_intf->tx_conf_queues,
-				fman_intf->fqid_tx_confirm);
-		if (ret) {
-			DPAA_PMD_ERR("DPAA TX CONFIRM queue init failed!");
-			goto free_tx;
-		}
-		dpaa_intf->tx_conf_queues->dpaa_intf = dpaa_intf;
 	}
-
 	DPAA_PMD_DEBUG("All frame queues created");
 
 	/* Get the initial configuration for flow control */
diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c
index 8593e20200..3bd35c7a0e 100644
--- a/drivers/net/dpaa/dpaa_rxtx.c
+++ b/drivers/net/dpaa/dpaa_rxtx.c
@@ -1083,8 +1083,7 @@ dpaa_eth_queue_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
 	struct dpaa_sw_buf_free buf_to_free[DPAA_MAX_SGS * DPAA_MAX_DEQUEUE_NUM_FRAMES];
 	uint32_t free_count = 0;
 	struct qman_fq *fq = q;
-	struct dpaa_if *dpaa_intf = fq->dpaa_intf;
-	struct qman_fq *fq_txconf = dpaa_intf->tx_conf_queues;
+	struct qman_fq *fq_txconf = fq->tx_conf_queue;
 
 	if (unlikely(!DPAA_PER_LCORE_PORTAL)) {
 		ret = rte_dpaa_portal_init((void *)0);
-- 
2.25.1