patch 'net/hns3: fix ignored reset event' has been queued to stable release 22.11.4

Xueming Li xuemingl at nvidia.com
Mon Dec 11 11:12:23 CET 2023


Hi,

FYI, your patch has been queued to stable release 22.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 12/13/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=c5d0485861b15bcafcc17d969e6f4332e34033ab

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From c5d0485861b15bcafcc17d969e6f4332e34033ab Mon Sep 17 00:00:00 2001
From: Dengdui Huang <huangdengdui at huawei.com>
Date: Mon, 27 Nov 2023 21:39:01 +0800
Subject: [PATCH] net/hns3: fix ignored reset event
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 4c40006c4b6b3c567185c84d60535752c9f7ea3d ]

The code logic that only new reset whose level is higher than old
reset level will be addressed is added in 'hns3_detect_reset_event()',
in fixed commit.

When the new reset is detected and the old reset level is
HNS3_NONE_RESET this reset will be ignored. This patch fix it.

Fixes: 5be38fc6c0fc ("net/hns3: fix multiple reset detected log")

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

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index f1131f4ba8..27f9dd2eb2 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -5594,7 +5594,10 @@ hns3_detect_reset_event(struct hns3_hw *hw)
 		new_req = HNS3_GLOBAL_RESET;
 	}
 
-	if (new_req != HNS3_NONE_RESET && last_req < new_req) {
+	if (new_req == HNS3_NONE_RESET)
+		return HNS3_NONE_RESET;
+
+	if (last_req == HNS3_NONE_RESET || last_req < new_req) {
 		hns3_schedule_delayed_reset(hns);
 		hns3_warn(hw, "High level reset detected, delay do reset");
 	}
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-12-11 17:56:26.863382000 +0800
+++ 0118-net-hns3-fix-ignored-reset-event.patch	2023-12-11 17:56:23.247652300 +0800
@@ -1 +1 @@
-From 4c40006c4b6b3c567185c84d60535752c9f7ea3d Mon Sep 17 00:00:00 2001
+From c5d0485861b15bcafcc17d969e6f4332e34033ab Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 4c40006c4b6b3c567185c84d60535752c9f7ea3d ]
@@ -14 +16,0 @@
-Cc: stable at dpdk.org
@@ -23 +25 @@
-index 941d047bf1..ae81368f68 100644
+index f1131f4ba8..27f9dd2eb2 100644
@@ -26 +28 @@
-@@ -5560,7 +5560,10 @@ hns3_detect_reset_event(struct hns3_hw *hw)
+@@ -5594,7 +5594,10 @@ hns3_detect_reset_event(struct hns3_hw *hw)


More information about the stable mailing list