56 lines
2.3 KiB
Diff
56 lines
2.3 KiB
Diff
From 44d9658f603e15947345c1ea3732fe504a3f7843 Mon Sep 17 00:00:00 2001
|
|
From: Yufeng Mo <moyufeng@huawei.com>
|
|
Date: Sat, 24 Jul 2021 15:44:27 +0800
|
|
Subject: [PATCH 068/283] net: hns3: clear unnecessary reset request in
|
|
hclge_reset_rebuild
|
|
|
|
mainline inclusion
|
|
from mainline-v5.13-rc1
|
|
commit 8c9200e387721c597baabb319b4bd1cdf1155e35
|
|
category: bugfix
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8EMQV
|
|
CVE: NA
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8c9200e387721c597baabb319b4bd1cdf1155e35
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
HW error and global reset are reported through MSIX interrupts.
|
|
The same error may be reported to different functions at the
|
|
same time. When global reset begins, the pending reset request
|
|
set by this error is unnecessary. So clear the pending reset
|
|
request after the reset is complete to avoid the repeated reset.
|
|
|
|
Fixes: f6162d44126c ("net: hns3: add handling of hw errors reported through MSIX")
|
|
Signed-off-by: Yufeng Mo <moyufeng@huawei.com>
|
|
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Reviewed-by: Yongxin Li <liyongxin1@huawei.com>
|
|
Signed-off-by: Junxin Chen <chenjunxin1@huawei.com>
|
|
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
|
|
Signed-off-by: Xiaodong Li <lixiaodong67@huawei.com>
|
|
---
|
|
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
index 0f5bb93927f7..bc70eb4fae64 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
@@ -3871,6 +3871,12 @@ static void hclge_update_reset_level(struct hclge_dev *hdev)
|
|
struct hnae3_ae_dev *ae_dev = pci_get_drvdata(hdev->pdev);
|
|
enum hnae3_reset_type reset_level;
|
|
|
|
+ /* reset request will not be set during reset, so clear
|
|
+ * pending reset request to avoid unnecessary reset
|
|
+ * caused by the same reason.
|
|
+ */
|
|
+ hclge_get_reset_level(ae_dev, &hdev->reset_request);
|
|
+
|
|
/* if default_reset_request has a higher level reset request,
|
|
* it should be handled as soon as possible. since some errors
|
|
* need this kind of reset to fix.
|
|
--
|
|
2.34.1
|
|
|