[dpdk-stable] patch 'net/ixgbe: fix flow control status' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.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 07/26/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 c1d088135a4268c025c9ff95fc769f36c976f11e Mon Sep 17 00:00:00 2001
From: Guinan Sun <guinanx.sun at intel.com>
Date: Sat, 23 May 2020 05:22:39 +0000
Subject: [PATCH] net/ixgbe: fix flow control status

[ upstream commit c778b7a39f30ffbb8326f81389668dc5f6f30888 ]

mac_ctrl_frame_fwd assignment is missing, so
setting mac_ctrl_frame_fwd should be added in
ixgbe_flow_ctrl_get().
The patch fixes the issue.

Fixes: 56ea46a997b7 ("ethdev: retrieve flow control configuration")

Signed-off-by: Guinan Sun <guinanx.sun at intel.com>
Reviewed-by: Wei Zhao <wei.zhao1 at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
Tested-by: Bo Chen <box.c.chen at intel.com>
---
 drivers/net/ixgbe/ixgbe_ethdev.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index ecbac8f18..875d4ee3d 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -4752,6 +4752,11 @@ ixgbe_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
 	 * MFLCN register.
 	 */
 	mflcn_reg = IXGBE_READ_REG(hw, IXGBE_MFLCN);
+	if (mflcn_reg & IXGBE_MFLCN_PMCF)
+		fc_conf->mac_ctrl_frame_fwd = 1;
+	else
+		fc_conf->mac_ctrl_frame_fwd = 0;
+
 	if (mflcn_reg & (IXGBE_MFLCN_RPFCE | IXGBE_MFLCN_RFCE))
 		rx_pause = 1;
 	else
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:54.966896367 +0100
+++ 0166-net-ixgbe-fix-flow-control-status.patch	2020-07-24 12:53:48.563011602 +0100
@@ -1,15 +1,16 @@
-From c778b7a39f30ffbb8326f81389668dc5f6f30888 Mon Sep 17 00:00:00 2001
+From c1d088135a4268c025c9ff95fc769f36c976f11e Mon Sep 17 00:00:00 2001
 From: Guinan Sun <guinanx.sun at intel.com>
 Date: Sat, 23 May 2020 05:22:39 +0000
 Subject: [PATCH] net/ixgbe: fix flow control status
 
+[ upstream commit c778b7a39f30ffbb8326f81389668dc5f6f30888 ]
+
 mac_ctrl_frame_fwd assignment is missing, so
 setting mac_ctrl_frame_fwd should be added in
 ixgbe_flow_ctrl_get().
 The patch fixes the issue.
 
 Fixes: 56ea46a997b7 ("ethdev: retrieve flow control configuration")
-Cc: stable at dpdk.org
 
 Signed-off-by: Guinan Sun <guinanx.sun at intel.com>
 Reviewed-by: Wei Zhao <wei.zhao1 at intel.com>
@@ -20,10 +21,10 @@
  1 file changed, 5 insertions(+)
 
 diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
-index 74c3c6b5d..fd0cb9b0e 100644
+index ecbac8f18..875d4ee3d 100644
 --- a/drivers/net/ixgbe/ixgbe_ethdev.c
 +++ b/drivers/net/ixgbe/ixgbe_ethdev.c
-@@ -4743,6 +4743,11 @@ ixgbe_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
+@@ -4752,6 +4752,11 @@ ixgbe_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
  	 * MFLCN register.
  	 */
  	mflcn_reg = IXGBE_READ_REG(hw, IXGBE_MFLCN);