patch 'net/dpaa: fix event queue detach' has been queued to stable release 21.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/30/22. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/82ccc27de556076d4b4baab55da6599bab141119

Thanks.

Kevin

---
>From 82ccc27de556076d4b4baab55da6599bab141119 Mon Sep 17 00:00:00 2001
From: Gagandeep Singh <g.singh at nxp.com>
Date: Fri, 22 Apr 2022 10:27:29 +0530
Subject: [PATCH] net/dpaa: fix event queue detach

[ upstream commit ee6647e0169bae7bb3d3a53c309cd280e4740e11 ]

Calling the correct qman queue free APIs to de-attach the queue.

Fixes: 5e7455931442 ("net/dpaa: support Rx queue configurations with eventdev")

Signed-off-by: Gagandeep Singh <g.singh at nxp.com>
Acked-by: Hemant Agrawal <hemant.agrawal at nxp.com>
---
 drivers/net/dpaa/dpaa_ethdev.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index 2c2c4e4ebb..9847ca1be1 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -1202,5 +1202,5 @@ dpaa_eth_eventq_detach(const struct rte_eth_dev *dev,
 		int eth_rx_queue_id)
 {
-	struct qm_mcc_initfq opts;
+	struct qm_mcc_initfq opts = {0};
 	int ret;
 	u32 flags = 0;
@@ -1208,15 +1208,9 @@ dpaa_eth_eventq_detach(const struct rte_eth_dev *dev,
 	struct qman_fq *rxq = &dpaa_intf->rx_queues[eth_rx_queue_id];
 
-	dpaa_poll_queue_default_config(&opts);
-
-	if (dpaa_intf->cgr_rx) {
-		opts.we_mask |= QM_INITFQ_WE_CGID;
-		opts.fqd.cgid = dpaa_intf->cgr_rx[eth_rx_queue_id].cgrid;
-		opts.fqd.fq_ctrl |= QM_FQCTRL_CGE;
-	}
-
+	qman_retire_fq(rxq, NULL);
+	qman_oos_fq(rxq);
 	ret = qman_init_fq(rxq, flags, &opts);
 	if (ret) {
-		DPAA_PMD_ERR("init rx fqid %d failed with ret: %d",
+		DPAA_PMD_ERR("detach rx fqid %d failed with ret: %d",
 			     rxq->fqid, ret);
 	}
-- 
2.34.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-05-25 17:26:58.926290460 +0100
+++ 0013-net-dpaa-fix-event-queue-detach.patch	2022-05-25 17:26:58.547828302 +0100
@@ -1 +1 @@
-From ee6647e0169bae7bb3d3a53c309cd280e4740e11 Mon Sep 17 00:00:00 2001
+From 82ccc27de556076d4b4baab55da6599bab141119 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ee6647e0169bae7bb3d3a53c309cd280e4740e11 ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index bddb3bb15c..e5a072cf49 100644
+index 2c2c4e4ebb..9847ca1be1 100644
@@ -21 +22 @@
-@@ -1212,5 +1212,5 @@ dpaa_eth_eventq_detach(const struct rte_eth_dev *dev,
+@@ -1202,5 +1202,5 @@ dpaa_eth_eventq_detach(const struct rte_eth_dev *dev,
@@ -28 +29 @@
-@@ -1218,15 +1218,9 @@ dpaa_eth_eventq_detach(const struct rte_eth_dev *dev,
+@@ -1208,15 +1208,9 @@ dpaa_eth_eventq_detach(const struct rte_eth_dev *dev,