patch 'event/cnxk: wait for CPT flow control on WQE path' has been queued to stable release 21.11.4

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/28/23. 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/da4a271c759b7107ca241d5302bb00017b3e4472

Thanks.

Kevin

---
>From da4a271c759b7107ca241d5302bb00017b3e4472 Mon Sep 17 00:00:00 2001
From: Rahul Bhansali <rbhansali at marvell.com>
Date: Thu, 19 Jan 2023 11:23:15 +0530
Subject: [PATCH] event/cnxk: wait for CPT flow control on WQE path

[ upstream commit d6ef4695c3b449259b29225e62bb6116ad420227 ]

Wait for CPT flow control on WQE path to avoid CPT queue
overflow and thereby a CPT misc interrupt.

Fixes: 1a7da795f64a ("net/cnxk: support Tx security offload on cn9k")

Signed-off-by: Rahul Bhansali <rbhansali at marvell.com>
---
 drivers/event/cnxk/cn9k_worker.h |  1 +
 drivers/net/cnxk/cn9k_tx.h       | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/drivers/event/cnxk/cn9k_worker.h b/drivers/event/cnxk/cn9k_worker.h
index 8abdd13b66..695e3ae429 100644
--- a/drivers/event/cnxk/cn9k_worker.h
+++ b/drivers/event/cnxk/cn9k_worker.h
@@ -586,4 +586,5 @@ cn9k_sso_hws_xmit_sec_one(const struct cn9k_eth_txq *txq, uint64_t base,
 	rte_io_wmb();
 	cn9k_sso_txq_fc_wait(txq);
+	cn9k_nix_sec_fc_wait_one(txq);
 
 	/* Write CPT instruction to lmt line */
diff --git a/drivers/net/cnxk/cn9k_tx.h b/drivers/net/cnxk/cn9k_tx.h
index 66a59ab533..fe44ff4290 100644
--- a/drivers/net/cnxk/cn9k_tx.h
+++ b/drivers/net/cnxk/cn9k_tx.h
@@ -343,4 +343,14 @@ cn9k_nix_xmit_prep_lmt(uint64_t *cmd, void *lmt_addr, const uint32_t flags)
 }
 
+static __rte_always_inline void
+cn9k_nix_sec_fc_wait_one(const struct cn9k_eth_txq *txq)
+{
+	uint64_t nb_desc = txq->cpt_desc;
+	uint64_t *fc = txq->cpt_fc;
+
+	while (nb_desc <= __atomic_load_n(fc, __ATOMIC_RELAXED))
+		;
+}
+
 static __rte_always_inline uint64_t
 cn9k_nix_xmit_submit_lmt(const rte_iova_t io_addr)
-- 
2.39.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-02-23 14:46:24.726897048 +0000
+++ 0037-event-cnxk-wait-for-CPT-flow-control-on-WQE-path.patch	2023-02-23 14:46:23.759235928 +0000
@@ -1 +1 @@
-From d6ef4695c3b449259b29225e62bb6116ad420227 Mon Sep 17 00:00:00 2001
+From da4a271c759b7107ca241d5302bb00017b3e4472 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d6ef4695c3b449259b29225e62bb6116ad420227 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 4c3932da47..d3c5180fbc 100644
+index 8abdd13b66..695e3ae429 100644
@@ -22 +23 @@
-@@ -731,4 +731,5 @@ cn9k_sso_hws_xmit_sec_one(const struct cn9k_eth_txq *txq, uint64_t base,
+@@ -586,4 +586,5 @@ cn9k_sso_hws_xmit_sec_one(const struct cn9k_eth_txq *txq, uint64_t base,
@@ -29 +30 @@
-index 404edd6aed..7362025a34 100644
+index 66a59ab533..fe44ff4290 100644
@@ -32 +33 @@
-@@ -389,4 +389,14 @@ cn9k_nix_xmit_prep_lmt(uint64_t *cmd, void *lmt_addr, const uint32_t flags)
+@@ -343,4 +343,14 @@ cn9k_nix_xmit_prep_lmt(uint64_t *cmd, void *lmt_addr, const uint32_t flags)