6d07a1f8c8
Sync some patches for hns3 about refactor mailbox and bugfix, modifies are as follow: net/hns3: fix reset level comparison net/hns3: fix disable command with firmware net/hns3: fix VF multiple count on one reset net/hns3: refactor handle mailbox function net/hns3: refactor send mailbox function net/hns3: refactor PF mailbox message struct net/hns3: refactor VF mailbox message struct Signed-off-by: Dengdui Huang <huangdengdui@huawei.com> (cherry picked from commit de38802427dd9f95f5ad5505969f582598e366b4)
49 lines
1.8 KiB
Diff
49 lines
1.8 KiB
Diff
From be5fbe07c062de14b65841bda52ca1c080de15e3 Mon Sep 17 00:00:00 2001
|
|
From: Dengdui Huang <huangdengdui@huawei.com>
|
|
Date: Fri, 8 Dec 2023 15:44:15 +0800
|
|
Subject: [PATCH 417/418] net/hns3: fix disable command with firmware
|
|
|
|
[ upstream commit cb37b1f1f84428d0a31437fad6e0909b799b5b4d ]
|
|
|
|
Disable command only when need to delay handle reset.
|
|
This patch fixes it.
|
|
|
|
Fixes: 5be38fc6c0fc ("net/hns3: fix multiple reset detected log")
|
|
Cc: stable@dpdk.org
|
|
|
|
Signed-off-by: Dengdui Huang <huangdengdui@huawei.com>
|
|
Signed-off-by: Jie Hai <haijie1@huawei.com>
|
|
---
|
|
drivers/net/hns3/hns3_ethdev.c | 8 +++-----
|
|
1 file changed, 3 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
|
|
index b151a62ccc..3de7a5f813 100644
|
|
--- a/drivers/net/hns3/hns3_ethdev.c
|
|
+++ b/drivers/net/hns3/hns3_ethdev.c
|
|
@@ -5552,18 +5552,16 @@ hns3_detect_reset_event(struct hns3_hw *hw)
|
|
|
|
last_req = hns3_get_reset_level(hns, &hw->reset.pending);
|
|
vector0_intr_state = hns3_read_dev(hw, HNS3_VECTOR0_OTHER_INT_STS_REG);
|
|
- if (BIT(HNS3_VECTOR0_IMPRESET_INT_B) & vector0_intr_state) {
|
|
- __atomic_store_n(&hw->reset.disable_cmd, 1, __ATOMIC_RELAXED);
|
|
+ if (BIT(HNS3_VECTOR0_IMPRESET_INT_B) & vector0_intr_state)
|
|
new_req = HNS3_IMP_RESET;
|
|
- } else if (BIT(HNS3_VECTOR0_GLOBALRESET_INT_B) & vector0_intr_state) {
|
|
- __atomic_store_n(&hw->reset.disable_cmd, 1, __ATOMIC_RELAXED);
|
|
+ else if (BIT(HNS3_VECTOR0_GLOBALRESET_INT_B) & vector0_intr_state)
|
|
new_req = HNS3_GLOBAL_RESET;
|
|
- }
|
|
|
|
if (new_req == HNS3_NONE_RESET)
|
|
return HNS3_NONE_RESET;
|
|
|
|
if (last_req == HNS3_NONE_RESET || last_req < new_req) {
|
|
+ __atomic_store_n(&hw->reset.disable_cmd, 1, __ATOMIC_RELAXED);
|
|
hns3_schedule_delayed_reset(hns);
|
|
hns3_warn(hw, "High level reset detected, delay do reset");
|
|
}
|
|
--
|
|
2.41.0.windows.2
|
|
|