patch 'net/ngbe: rename some extended statistics' has been queued to stable release 21.11.3

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to stable release 21.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 11/01/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/9f6bab86f3af235c1511ec192958060858a35fc6

Thanks.

Kevin

---
From 9f6bab86f3af235c1511ec192958060858a35fc6 Mon Sep 17 00:00:00 2001
From: Jiawen Wu <jiawenwu@trustnetic.com>
Date: Fri, 2 Sep 2022 11:00:07 +0800
Subject: [PATCH] net/ngbe: rename some extended statistics

[ upstream commit fee9350f1d23ab9deeaf287be41212c9f0d85d5e ]

Rename rx_oversize_errors to rx_oversize_cnt since it depends on giant
packet size limit instead of MTU, by hardware design.
Rename rx_drop_packets and tx_drop_packets to rx_dma_drop and tx_dma_drop
to indicate the drop location.
And add tx_dma_drop to extended statistics.

Fixes: 8b433d04adc9 ("net/ngbe: support device xstats")

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
---
 drivers/net/ngbe/base/ngbe_type.h |  5 ++---
 drivers/net/ngbe/ngbe_ethdev.c    | 10 +++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ngbe/base/ngbe_type.h b/drivers/net/ngbe/base/ngbe_type.h
index 4c995e7397..043da3cd25 100644
--- a/drivers/net/ngbe/base/ngbe_type.h
+++ b/drivers/net/ngbe/base/ngbe_type.h
@@ -137,7 +137,6 @@ struct ngbe_hw_stats {
 	u64 mng_host2bmc_packets;
 	/* Basix RxTx */
-	u64 rx_drop_packets;
-	u64 tx_drop_packets;
 	u64 rx_dma_drop;
+	u64 tx_dma_drop;
 	u64 tx_secdrp_packets;
 	u64 rx_packets;
@@ -165,5 +164,5 @@ struct ngbe_hw_stats {
 	u64 rx_undersize_errors;
 	u64 rx_fragment_errors;
-	u64 rx_oversize_errors;
+	u64 rx_oversize_cnt;
 	u64 rx_jabber_errors;
 	u64 rx_l3_l4_xsum_error;
diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c
index b930326379..92eb36f5d4 100644
--- a/drivers/net/ngbe/ngbe_ethdev.c
+++ b/drivers/net/ngbe/ngbe_ethdev.c
@@ -166,4 +166,5 @@ static const struct rte_ngbe_xstats_name_off rte_ngbe_stats_strings[] = {
 	HW_XSTAT(rx_management_dropped),
 	HW_XSTAT(rx_dma_drop),
+	HW_XSTAT(tx_dma_drop),
 	HW_XSTAT(tx_secdrp_packets),
 
@@ -176,5 +177,5 @@ static const struct rte_ngbe_xstats_name_off rte_ngbe_stats_strings[] = {
 	HW_XSTAT(rx_undersize_errors),
 	HW_XSTAT(rx_fragment_errors),
-	HW_XSTAT(rx_oversize_errors),
+	HW_XSTAT(rx_oversize_cnt),
 	HW_XSTAT(rx_jabber_errors),
 	HW_XSTAT(rx_l3_l4_xsum_error),
@@ -1351,7 +1352,6 @@ ngbe_read_stats_registers(struct ngbe_hw *hw,
 
 	/* DMA Stats */
-	hw_stats->rx_drop_packets += rd32(hw, NGBE_DMARXDROP);
-	hw_stats->tx_drop_packets += rd32(hw, NGBE_DMATXDROP);
 	hw_stats->rx_dma_drop += rd32(hw, NGBE_DMARXDROP);
+	hw_stats->tx_dma_drop += rd32(hw, NGBE_DMATXDROP);
 	hw_stats->tx_secdrp_packets += rd32(hw, NGBE_DMATXSECDROP);
 	hw_stats->rx_packets += rd32(hw, NGBE_DMARXPKT);
@@ -1390,5 +1390,5 @@ ngbe_read_stats_registers(struct ngbe_hw *hw,
 
 	hw_stats->rx_undersize_errors += rd64(hw, NGBE_MACRXERRLENL);
-	hw_stats->rx_oversize_errors += rd32(hw, NGBE_MACRXOVERSIZE);
+	hw_stats->rx_oversize_cnt += rd32(hw, NGBE_MACRXOVERSIZE);
 	hw_stats->rx_jabber_errors += rd32(hw, NGBE_MACRXJABBER);
 
@@ -1489,5 +1489,5 @@ ngbe_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
 			  hw_stats->rx_length_errors +
 			  hw_stats->rx_undersize_errors +
-			  hw_stats->rx_oversize_errors +
+			  hw_stats->rdb_drp_cnt +
 			  hw_stats->rx_illegal_byte_errors +
 			  hw_stats->rx_error_bytes +
-- 
2.37.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-10-25 14:18:58.995243853 +0100
+++ 0019-net-ngbe-rename-some-extended-statistics.patch	2022-10-25 14:18:58.374797959 +0100
@@ -1 +1 @@
-From fee9350f1d23ab9deeaf287be41212c9f0d85d5e Mon Sep 17 00:00:00 2001
+From 9f6bab86f3af235c1511ec192958060858a35fc6 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit fee9350f1d23ab9deeaf287be41212c9f0d85d5e ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 4a6c273f1e..73111f7950 100644
+index 4c995e7397..043da3cd25 100644
@@ -25 +26 @@
-@@ -143,7 +143,6 @@ struct ngbe_hw_stats {
+@@ -137,7 +137,6 @@ struct ngbe_hw_stats {
@@ -34 +35 @@
-@@ -171,5 +170,5 @@ struct ngbe_hw_stats {
+@@ -165,5 +164,5 @@ struct ngbe_hw_stats {
@@ -42 +43 @@
-index 86c28099c4..df32bf64ff 100644
+index b930326379..92eb36f5d4 100644
@@ -58 +59 @@
-@@ -1375,7 +1376,6 @@ ngbe_read_stats_registers(struct ngbe_hw *hw,
+@@ -1351,7 +1352,6 @@ ngbe_read_stats_registers(struct ngbe_hw *hw,
@@ -67 +68 @@
-@@ -1414,5 +1414,5 @@ ngbe_read_stats_registers(struct ngbe_hw *hw,
+@@ -1390,5 +1390,5 @@ ngbe_read_stats_registers(struct ngbe_hw *hw,
@@ -74 +75 @@
-@@ -1513,5 +1513,5 @@ ngbe_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
+@@ -1489,5 +1489,5 @@ ngbe_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)