From a80446eddd273e5f49f02b5884812081ec9e7140 Mon Sep 17 00:00:00 2001 From: Dengdui Huang Date: Mon, 27 Nov 2023 21:39:01 +0800 Subject: [PATCH 395/397] net/hns3: fix ignored reset event [ 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") Cc: stable@dpdk.org Signed-off-by: Dengdui Huang Acked-by: Jie Hai --- 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 2d4af9f3ea..43409865ee 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -5560,7 +5560,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.33.0