[dpdk-stable] patch 'net/hns3: fix DCB reconfiguration' has been queued to stable release 19.11.9

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/12/21. 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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/43fd40175a729db764b45d4ec63b74eb1f5b6ade

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 43fd40175a729db764b45d4ec63b74eb1f5b6ade Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong at huawei.com>
Date: Sat, 15 May 2021 08:52:37 +0800
Subject: [PATCH] net/hns3: fix DCB reconfiguration

[ upstream commit b67bdfc8f6630934f3005ad531225c7203304661 ]

Whether the enable bit of the pfc ("pfc_en") is changed or not is one of
the conditions for reconfiguring the DCB. Currently, pfc_en is not
rolled back when DCB configuration fails. This patch fixes it.

Fixes: 62e3ccc2b94c ("net/hns3: support flow control")

Signed-off-by: Huisong Li <lihuisong at huawei.com>
Signed-off-by: Min Hu (Connor) <humin29 at huawei.com>
---
 drivers/net/hns3/hns3_dcb.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/hns3/hns3_dcb.c b/drivers/net/hns3/hns3_dcb.c
index 4ecb6a97b0..81fe86aa39 100644
--- a/drivers/net/hns3/hns3_dcb.c
+++ b/drivers/net/hns3/hns3_dcb.c
@@ -1392,6 +1392,7 @@ hns3_dcb_hw_configure(struct hns3_adapter *hns)
 	enum hns3_fc_status fc_status = hw->current_fc_status;
 	enum hns3_fc_mode requested_fc_mode = hw->requested_fc_mode;
 	uint8_t hw_pfc_map = hw->dcb_info.hw_pfc_map;
+	uint8_t pfc_en = hw->dcb_info.pfc_en;
 	int ret;
 
 	if (pf->tx_sch_mode != HNS3_FLAG_TC_BASE_SCH_MODE &&
@@ -1445,6 +1446,7 @@ pfc_setup_fail:
 	hw->current_fc_status = fc_status;
 
 buffer_alloc_fail:
+	hw->dcb_info.pfc_en = pfc_en;
 	hw->dcb_info.hw_pfc_map = hw_pfc_map;
 
 	return ret;
-- 
2.31.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-06-10 14:05:00.366558832 +0200
+++ 0049-net-hns3-fix-DCB-reconfiguration.patch	2021-06-10 14:04:58.102024911 +0200
@@ -1 +1 @@
-From b67bdfc8f6630934f3005ad531225c7203304661 Mon Sep 17 00:00:00 2001
+From 43fd40175a729db764b45d4ec63b74eb1f5b6ade Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b67bdfc8f6630934f3005ad531225c7203304661 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 1cb6adb886..90c0d041c9 100644
+index 4ecb6a97b0..81fe86aa39 100644
@@ -23 +24 @@
-@@ -1543,6 +1543,7 @@ hns3_dcb_hw_configure(struct hns3_adapter *hns)
+@@ -1392,6 +1392,7 @@ hns3_dcb_hw_configure(struct hns3_adapter *hns)
@@ -31 +32 @@
-@@ -1596,6 +1597,7 @@ pfc_setup_fail:
+@@ -1445,6 +1446,7 @@ pfc_setup_fail: