patch 'net/cnxk: fix uninitialized variables' 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/08d2d8868eb539d69db1a286d5b58657f63c45a3

Thanks.

Kevin

---
>From 08d2d8868eb539d69db1a286d5b58657f63c45a3 Mon Sep 17 00:00:00 2001
From: Gowrishankar Muthukrishnan <gmuthukrishn at marvell.com>
Date: Sun, 24 Apr 2022 21:48:18 +0530
Subject: [PATCH] net/cnxk: fix uninitialized variables

[ upstream commit 938ba5f9b9fe85d011b170e42291840ab19340e5 ]

Fix uninitialized scalar variable reported in coverity scan.

Coverity issue: 371876, 371877
Coverity issue: 371872, 371880
Fixes: 39dc567c195 ("net/cnxk: add Tx burst for CN9K")
Fixes: 19f3af2371a ("net/cnxk: add Tx burst for CN10K")

Signed-off-by: Gowrishankar Muthukrishnan <gmuthukrishn at marvell.com>
Acked-by: Jerin Jacob <jerinj at marvell.com>
---
 drivers/net/cnxk/cn10k_tx.h | 4 ++--
 drivers/net/cnxk/cn9k_tx.h  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/cnxk/cn10k_tx.h b/drivers/net/cnxk/cn10k_tx.h
index f3a282f429..6704d2d655 100644
--- a/drivers/net/cnxk/cn10k_tx.h
+++ b/drivers/net/cnxk/cn10k_tx.h
@@ -850,6 +850,6 @@ cn10k_nix_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts,
 	uint16_t lmt_id, burst, left, i;
 	uintptr_t c_lbase = lbase;
+	uint64_t lso_tun_fmt = 0;
 	rte_iova_t c_io_addr;
-	uint64_t lso_tun_fmt;
 	uint16_t c_lmt_id;
 	uint64_t sa_base;
@@ -977,7 +977,7 @@ cn10k_nix_xmit_pkts_mseg(void *tx_queue, struct rte_mbuf **tx_pkts,
 	uint8_t lnum, c_lnum, c_loff;
 	uintptr_t c_lbase = lbase;
+	uint64_t lso_tun_fmt = 0;
 	uint64_t data0, data1;
 	rte_iova_t c_io_addr;
-	uint64_t lso_tun_fmt;
 	uint8_t shft, c_shft;
 	__uint128_t data128;
diff --git a/drivers/net/cnxk/cn9k_tx.h b/drivers/net/cnxk/cn9k_tx.h
index 070a7d9439..8167313a15 100644
--- a/drivers/net/cnxk/cn9k_tx.h
+++ b/drivers/net/cnxk/cn9k_tx.h
@@ -466,6 +466,6 @@ cn9k_nix_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts,
 	struct cn9k_eth_txq *txq = tx_queue;
 	const rte_iova_t io_addr = txq->io_addr;
+	uint64_t lso_tun_fmt = 0;
 	void *lmt_addr = txq->lmt_addr;
-	uint64_t lso_tun_fmt;
 	uint16_t i;
 
@@ -507,6 +507,6 @@ cn9k_nix_xmit_pkts_mseg(void *tx_queue, struct rte_mbuf **tx_pkts,
 	struct cn9k_eth_txq *txq = tx_queue;
 	const rte_iova_t io_addr = txq->io_addr;
+	uint64_t lso_tun_fmt = 0;
 	void *lmt_addr = txq->lmt_addr;
-	uint64_t lso_tun_fmt;
 	uint16_t segdw;
 	uint64_t i;
-- 
2.34.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-05-25 17:26:59.372212984 +0100
+++ 0033-net-cnxk-fix-uninitialized-variables.patch	2022-05-25 17:26:58.611828396 +0100
@@ -1 +1 @@
-From 938ba5f9b9fe85d011b170e42291840ab19340e5 Mon Sep 17 00:00:00 2001
+From 08d2d8868eb539d69db1a286d5b58657f63c45a3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 938ba5f9b9fe85d011b170e42291840ab19340e5 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index de88a21e08..5d4003c5d4 100644
+index f3a282f429..6704d2d655 100644
@@ -25 +26 @@
-@@ -867,8 +867,8 @@ cn10k_nix_xmit_pkts(void *tx_queue, uint64_t *ws, struct rte_mbuf **tx_pkts,
+@@ -850,6 +850,6 @@ cn10k_nix_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts,
@@ -29,2 +29,0 @@
- 	uint64_t mark_fmt = 0;
- 	uint8_t mark_flag = 0;
@@ -35 +34 @@
-@@ -1000,9 +1000,9 @@ cn10k_nix_xmit_pkts_mseg(void *tx_queue, uint64_t *ws,
+@@ -977,7 +977,7 @@ cn10k_nix_xmit_pkts_mseg(void *tx_queue, struct rte_mbuf **tx_pkts,
@@ -39,2 +37,0 @@
- 	uint64_t mark_fmt = 0;
- 	uint8_t mark_flag = 0;
@@ -47 +44 @@
-index f55cd4bdf2..a0611a67c9 100644
+index 070a7d9439..8167313a15 100644
@@ -50 +47 @@
-@@ -527,5 +527,5 @@ cn9k_nix_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts,
+@@ -466,6 +466,6 @@ cn9k_nix_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts,
@@ -53,2 +50 @@
--	uint64_t lso_tun_fmt, mark_fmt = 0;
-+	uint64_t lso_tun_fmt = 0, mark_fmt = 0;
++	uint64_t lso_tun_fmt = 0;
@@ -56,2 +52,4 @@
- 	uint8_t mark_flag = 0;
-@@ -575,5 +575,5 @@ cn9k_nix_xmit_pkts_mseg(void *tx_queue, struct rte_mbuf **tx_pkts,
+-	uint64_t lso_tun_fmt;
+ 	uint16_t i;
+ 
+@@ -507,6 +507,6 @@ cn9k_nix_xmit_pkts_mseg(void *tx_queue, struct rte_mbuf **tx_pkts,
@@ -60,2 +58 @@
--	uint64_t lso_tun_fmt, mark_fmt = 0;
-+	uint64_t lso_tun_fmt = 0, mark_fmt = 0;
++	uint64_t lso_tun_fmt = 0;
@@ -63 +60,3 @@
- 	uint8_t mark_flag = 0;
+-	uint64_t lso_tun_fmt;
+ 	uint16_t segdw;
+ 	uint64_t i;