[dpdk-stable] patch 'net/ixgbe: fix statistics in flow control mode' 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/24/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 f98d3de91334216d2b9616ec987c0017473c66e0 Mon Sep 17 00:00:00 2001
From: Guinan Sun <guinanx.sun at intel.com>
Date: Tue, 12 May 2020 08:13:06 +0000
Subject: [PATCH] net/ixgbe: fix statistics in flow control mode

[ upstream commit 861ca8b1e97c68727cbafbb859cc6c2ff017801e ]

The register autoneg can't be updated synchronously with flow control
mode setting in the state of port start, so NIC statistics error occurs.
AUTO_NEG Advt register should be updated by ixgbe_setup_fc() when
enabling flow control.
The patch fixes the issue.

Fixes: a524f550da6e ("net/ixgbe: fix flow control mode setting")

Signed-off-by: Guinan Sun <guinanx.sun at intel.com>
Reviewed-by: Wei Zhao <wei.zhao1 at intel.com>
---
 drivers/net/ixgbe/ixgbe_ethdev.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index ce0c05fcc2..50edb69cb2 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -2541,6 +2541,8 @@ ixgbe_flow_ctrl_enable(struct rte_eth_dev *dev, struct ixgbe_hw *hw)
 	int err;
 	uint32_t mflcn;
 
+	ixgbe_setup_fc(hw);
+
 	err = ixgbe_fc_enable(hw);
 
 	/* Not negotiated is not an error case */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-22 10:37:39.720114530 +0100
+++ 0013-net-ixgbe-fix-statistics-in-flow-control-mode.patch	2020-05-22 10:37:39.088411997 +0100
@@ -1,8 +1,10 @@
-From 861ca8b1e97c68727cbafbb859cc6c2ff017801e Mon Sep 17 00:00:00 2001
+From f98d3de91334216d2b9616ec987c0017473c66e0 Mon Sep 17 00:00:00 2001
 From: Guinan Sun <guinanx.sun at intel.com>
 Date: Tue, 12 May 2020 08:13:06 +0000
 Subject: [PATCH] net/ixgbe: fix statistics in flow control mode
 
+[ upstream commit 861ca8b1e97c68727cbafbb859cc6c2ff017801e ]
+
 The register autoneg can't be updated synchronously with flow control
 mode setting in the state of port start, so NIC statistics error occurs.
 AUTO_NEG Advt register should be updated by ixgbe_setup_fc() when
@@ -10,7 +12,6 @@
 The patch fixes the issue.
 
 Fixes: a524f550da6e ("net/ixgbe: fix flow control mode setting")
-Cc: stable at dpdk.org
 
 Signed-off-by: Guinan Sun <guinanx.sun at intel.com>
 Reviewed-by: Wei Zhao <wei.zhao1 at intel.com>
@@ -19,10 +20,10 @@
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
-index a4e5c539de..f8a84c565f 100644
+index ce0c05fcc2..50edb69cb2 100644
 --- a/drivers/net/ixgbe/ixgbe_ethdev.c
 +++ b/drivers/net/ixgbe/ixgbe_ethdev.c
-@@ -2543,6 +2543,8 @@ ixgbe_flow_ctrl_enable(struct rte_eth_dev *dev, struct ixgbe_hw *hw)
+@@ -2541,6 +2541,8 @@ ixgbe_flow_ctrl_enable(struct rte_eth_dev *dev, struct ixgbe_hw *hw)
  	int err;
  	uint32_t mflcn;