[dpdk-stable] patch 'event/octeontx2: fix queue removal from Rx adapter' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

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/21/20. 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.

Thanks.

Luca Boccassi

---
>From a309eafc8902de65a2caf0e64a4c5c0303fbc27b Mon Sep 17 00:00:00 2001
From: Lukasz Bartosik <lbartosik at marvell.com>
Date: Thu, 16 Apr 2020 17:47:40 +0200
Subject: [PATCH] event/octeontx2: fix queue removal from Rx adapter

[ upstream commit 534d1d4b65468deed18723fb45818275887c8ecd ]

When eth port queue is removed from Rx adapter using
rte_event_eth_rx_adapter_queue_del() it incorrectly
initializes CQ context instead of modifying it. This
might lead to a crash when CQ context is modified
as a part of rte_eth_dev_stop() sequence as CQ will
hold invalid entries. This is responsibility of an
application to call rte_event_eth_rx_adapter_queue_del()
to remove eth port queue from Rx adapter in tear down
sequence.

Fixes: 37720fc1fba8 ("event/octeontx2: add Rx adapter")

Signed-off-by: Lukasz Bartosik <lbartosik at marvell.com>
Acked-by: Pavan Nikhilesh <pbhagavatula at marvell.com>
---
 drivers/event/octeontx2/otx2_evdev_adptr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/event/octeontx2/otx2_evdev_adptr.c b/drivers/event/octeontx2/otx2_evdev_adptr.c
index 233cba2aa3..8bdcfa3ea5 100644
--- a/drivers/event/octeontx2/otx2_evdev_adptr.c
+++ b/drivers/event/octeontx2/otx2_evdev_adptr.c
@@ -133,7 +133,7 @@ sso_rxq_disable(struct otx2_eth_dev *dev, uint16_t qid)
 	aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
 	aq->qidx = qid;
 	aq->ctype = NIX_AQ_CTYPE_CQ;
-	aq->op = NIX_AQ_INSTOP_INIT;
+	aq->op = NIX_AQ_INSTOP_WRITE;
 
 	aq->cq.ena = 1;
 	aq->cq.caching = 1;
@@ -144,7 +144,7 @@ sso_rxq_disable(struct otx2_eth_dev *dev, uint16_t qid)
 
 	rc = otx2_mbox_process(mbox);
 	if (rc < 0) {
-		otx2_err("Failed to init cq context");
+		otx2_err("Failed to enable cq context");
 		goto fail;
 	}
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:50.881850262 +0100
+++ 0157-event-octeontx2-fix-queue-removal-from-Rx-adapter.patch	2020-05-19 14:04:44.496653448 +0100
@@ -1,8 +1,10 @@
-From 534d1d4b65468deed18723fb45818275887c8ecd Mon Sep 17 00:00:00 2001
+From a309eafc8902de65a2caf0e64a4c5c0303fbc27b Mon Sep 17 00:00:00 2001
 From: Lukasz Bartosik <lbartosik at marvell.com>
 Date: Thu, 16 Apr 2020 17:47:40 +0200
 Subject: [PATCH] event/octeontx2: fix queue removal from Rx adapter
 
+[ upstream commit 534d1d4b65468deed18723fb45818275887c8ecd ]
+
 When eth port queue is removed from Rx adapter using
 rte_event_eth_rx_adapter_queue_del() it incorrectly
 initializes CQ context instead of modifying it. This
@@ -14,7 +16,6 @@
 sequence.
 
 Fixes: 37720fc1fba8 ("event/octeontx2: add Rx adapter")
-Cc: stable at dpdk.org
 
 Signed-off-by: Lukasz Bartosik <lbartosik at marvell.com>
 Acked-by: Pavan Nikhilesh <pbhagavatula at marvell.com>