92 lines
3.2 KiB
Diff
92 lines
3.2 KiB
Diff
From e5abebab275bf375c2c8f2a44e6a5587192857d7 Mon Sep 17 00:00:00 2001
|
|
From: Yufeng Mo <moyufeng@huawei.com>
|
|
Date: Sat, 24 Jul 2021 15:44:06 +0800
|
|
Subject: [PATCH 064/283] net: hns3: split function hclge_reset_rebuild()
|
|
|
|
mainline inclusion
|
|
from mainline-v5.13-rc1
|
|
commit 74d439b74ad3e05780d4cf3ab047345b443f7e67
|
|
category: feature
|
|
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=74d439b74ad3e05780d4cf3ab047345b443f7e67
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
hclge_reset_rebuild() is a bit too long. So add a new function
|
|
hclge_update_reset_level() to improve readability.
|
|
|
|
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>
|
|
|
|
Conflicts:
|
|
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
---
|
|
.../hisilicon/hns3/hns3pf/hclge_main.c | 30 ++++++++++---------
|
|
1 file changed, 16 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
index 6c2960df62a6..69ab9c00af4a 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
@@ -3866,6 +3866,21 @@ static bool hclge_reset_err_handle(struct hclge_dev *hdev)
|
|
return false;
|
|
}
|
|
|
|
+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;
|
|
+
|
|
+ /* 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.
|
|
+ */
|
|
+ reset_level = hclge_get_reset_level(ae_dev,
|
|
+ &hdev->default_reset_request);
|
|
+ if (reset_level != HNAE3_NONE_RESET)
|
|
+ set_bit(reset_level, &hdev->reset_request);
|
|
+}
|
|
+
|
|
static int hclge_set_rst_done(struct hclge_dev *hdev)
|
|
{
|
|
struct hclge_pf_rst_done_cmd *req;
|
|
@@ -3955,9 +3970,6 @@ static int hclge_reset_prepare(struct hclge_dev *hdev)
|
|
|
|
static int hclge_reset_rebuild(struct hclge_dev *hdev)
|
|
{
|
|
- struct hnae3_ae_dev *ae_dev = pci_get_drvdata(hdev->pdev);
|
|
- struct hnae3_handle *handle = &hdev->vport[0].nic;
|
|
- enum hnae3_reset_type reset_level;
|
|
int ret;
|
|
|
|
hdev->rst_stats.hw_reset_done_cnt++;
|
|
@@ -4001,17 +4013,7 @@ static int hclge_reset_rebuild(struct hclge_dev *hdev)
|
|
hdev->rst_stats.reset_done_cnt++;
|
|
clear_bit(HCLGE_STATE_RST_FAIL, &hdev->state);
|
|
|
|
- /* 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.
|
|
- */
|
|
- reset_level = hclge_get_reset_level(ae_dev,
|
|
- &hdev->default_reset_request);
|
|
- if (reset_level != HNAE3_NONE_RESET)
|
|
- set_bit(reset_level, &hdev->reset_request);
|
|
-
|
|
- if (handle && handle->ae_algo->ops->reset_end)
|
|
- handle->ae_algo->ops->reset_end(handle, true);
|
|
+ hclge_update_reset_level(hdev);
|
|
|
|
return 0;
|
|
}
|
|
--
|
|
2.34.1
|
|
|