patch 'net/hns3: fix reset event status' has been queued to stable release 21.11.6

Kevin Traynor ktraynor at redhat.com
Thu Dec 7 12:21:12 CET 2023


Hi,

FYI, your patch has been queued to stable release 21.11.6

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

Thanks.

Kevin

---
>From 90236089a26cfd1bd92eda63cb29c6ab05baa670 Mon Sep 17 00:00:00 2001
From: Dengdui Huang <huangdengdui at huawei.com>
Date: Mon, 27 Nov 2023 21:39:02 +0800
Subject: [PATCH] net/hns3: fix reset event status

[ upstream commit b59a0cbec866a8d4f7d1938b6826f7961c75c9fd ]

The function hns3_clear_reset_event is used to clear PF
reset status, The VF shouldn't use it.

This patch fixes it.

Fixes: 1eee1ea75c0e ("net/hns3: fix IMP or global reset")

Signed-off-by: Dengdui Huang <huangdengdui at huawei.com>
Acked-by: Jie Hai <haijie1 at huawei.com>
---
 drivers/net/hns3/hns3_intr.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/hns3/hns3_intr.c b/drivers/net/hns3/hns3_intr.c
index a2c7a90e41..9c5a4b018c 100644
--- a/drivers/net/hns3/hns3_intr.c
+++ b/drivers/net/hns3/hns3_intr.c
@@ -2731,5 +2731,6 @@ hns3_reset_post(struct hns3_adapter *hns)
 		hns3_notify_reset_ready(hw, false);
 		hns3_clear_reset_level(hw, &hw->reset.pending);
-		hns3_clear_reset_event(hw);
+		if (!hns->is_vf)
+			hns3_clear_reset_event(hw);
 		__atomic_store_n(&hns->hw.reset.resetting, 0, __ATOMIC_RELAXED);
 		hw->reset.attempts = 0;
-- 
2.43.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-12-07 11:19:00.078032406 +0000
+++ 0020-net-hns3-fix-reset-event-status.patch	2023-12-07 11:18:59.646873992 +0000
@@ -1 +1 @@
-From b59a0cbec866a8d4f7d1938b6826f7961c75c9fd Mon Sep 17 00:00:00 2001
+From 90236089a26cfd1bd92eda63cb29c6ab05baa670 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b59a0cbec866a8d4f7d1938b6826f7961c75c9fd ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -17,2 +18,2 @@
- drivers/net/hns3/hns3_intr.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
+ drivers/net/hns3/hns3_intr.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
@@ -21 +22 @@
-index c5a3e3797c..52b5435a23 100644
+index a2c7a90e41..9c5a4b018c 100644
@@ -24 +25 @@
-@@ -2750,5 +2750,6 @@ hns3_reset_post(struct hns3_adapter *hns)
+@@ -2731,5 +2731,6 @@ hns3_reset_post(struct hns3_adapter *hns)
@@ -32,8 +32,0 @@
-@@ -2800,5 +2801,6 @@ hns3_reset_fail_handle(struct hns3_adapter *hns)
- 
- 	hns3_clear_reset_level(hw, &hw->reset.pending);
--	hns3_clear_reset_event(hw);
-+	if (!hns->is_vf)
-+		hns3_clear_reset_event(hw);
- 	if (hns3_reset_err_handle(hns)) {
- 		hw->reset.stage = RESET_STAGE_PREWAIT;



More information about the stable mailing list