patch 'net/hns3: fix operating queue when TCAM table is invalid' has been queued to stable release 21.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/26/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/2ae91ac6603c2230f7bae0890096e90d23f1d896

Thanks.

Kevin

---
>From 2ae91ac6603c2230f7bae0890096e90d23f1d896 Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong at huawei.com>
Date: Fri, 28 Jan 2022 10:07:07 +0800
Subject: [PATCH] net/hns3: fix operating queue when TCAM table is invalid

[ upstream commit eae97230dc2ab9553cdb335ab9b287a18a1b0c97 ]

Reset queues will query the TCAM table. The table is cleared after global
or imp reset. Currently, PF driver first resets Rx/Tx queues and then
restore the table during the reset recovery process, which will fail to
query the table and trigger a RAS error.

Fixes: fa29fe45a7b4 ("net/hns3: support queue start and stop")

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

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 209ec75eac..2de1325d4b 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -4406,4 +4406,8 @@ hns3_init_hardware(struct hns3_adapter *hns)
 	int ret;
 
+	/*
+	 * All queue-related HW operations must be performed after the TCAM
+	 * table is configured.
+	 */
 	ret = hns3_map_tqp(hw);
 	if (ret) {
@@ -5575,4 +5579,10 @@ hns3_reinit_dev(struct hns3_adapter *hns)
 	}
 
+	ret = hns3_init_hardware(hns);
+	if (ret) {
+		hns3_err(hw, "Failed to init hardware: %d", ret);
+		return ret;
+	}
+
 	ret = hns3_reset_all_tqps(hns);
 	if (ret) {
@@ -5581,10 +5591,4 @@ hns3_reinit_dev(struct hns3_adapter *hns)
 	}
 
-	ret = hns3_init_hardware(hns);
-	if (ret) {
-		hns3_err(hw, "Failed to init hardware: %d", ret);
-		return ret;
-	}
-
 	ret = hns3_enable_hw_error_intr(hns, true);
 	if (ret) {
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-21 15:22:47.475939167 +0000
+++ 0133-net-hns3-fix-operating-queue-when-TCAM-table-is-inva.patch	2022-02-21 15:22:44.272704533 +0000
@@ -1 +1 @@
-From eae97230dc2ab9553cdb335ab9b287a18a1b0c97 Mon Sep 17 00:00:00 2001
+From 2ae91ac6603c2230f7bae0890096e90d23f1d896 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit eae97230dc2ab9553cdb335ab9b287a18a1b0c97 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 57f1572340..2641b6f79b 100644
+index 209ec75eac..2de1325d4b 100644
@@ -24 +25 @@
-@@ -4379,4 +4379,8 @@ hns3_init_hardware(struct hns3_adapter *hns)
+@@ -4406,4 +4406,8 @@ hns3_init_hardware(struct hns3_adapter *hns)
@@ -33 +34 @@
-@@ -5548,4 +5552,10 @@ hns3_reinit_dev(struct hns3_adapter *hns)
+@@ -5575,4 +5579,10 @@ hns3_reinit_dev(struct hns3_adapter *hns)
@@ -44 +45 @@
-@@ -5554,10 +5564,4 @@ hns3_reinit_dev(struct hns3_adapter *hns)
+@@ -5581,10 +5591,4 @@ hns3_reinit_dev(struct hns3_adapter *hns)