net: hns3: remove upgrade reset level when reset fail

Currently, hclge_reset_err_handle() will assert a global reset
when the failing count is smaller than MAX_RESET_FAIL_CNT, which
will affect other running functions.

So this patch removes this upgrading, and uses re-scheduling reset
task to do it.

Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Reviewed-by: Yunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 3fde5471e1c0424e0707084cd72f3733177e37cb..3c64d70df4d46801934a0056f3efda4868f61043 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -3305,7 +3305,7 @@ static int hclge_reset_prepare_wait(struct hclge_dev *hdev)
        return ret;
 }
 
-static bool hclge_reset_err_handle(struct hclge_dev *hdev, bool is_timeout)
+static bool hclge_reset_err_handle(struct hclge_dev *hdev)
 {
 #define MAX_RESET_FAIL_CNT 5
 
@@ -3322,20 +3322,11 @@ static bool hclge_reset_err_handle(struct hclge_dev *hdev, bool is_timeout)
                return false;
        } else if (hdev->reset_fail_cnt < MAX_RESET_FAIL_CNT) {
                hdev->reset_fail_cnt++;
-               if (is_timeout) {
-                       set_bit(hdev->reset_type, &hdev->reset_pending);
-                       dev_info(&hdev->pdev->dev,
-                                "re-schedule to wait for hw reset done\n");
-                       return true;
-               }
-
-               dev_info(&hdev->pdev->dev, "Upgrade reset level\n");
-               hclge_clear_reset_cause(hdev);
-               set_bit(HNAE3_GLOBAL_RESET, &hdev->default_reset_request);
-               mod_timer(&hdev->reset_timer,
-                         jiffies + HCLGE_RESET_INTERVAL);
-
-               return false;
+               set_bit(hdev->reset_type, &hdev->reset_pending);
+               dev_info(&hdev->pdev->dev,
+                        "re-schedule reset task(%d)\n",
+                        hdev->reset_fail_cnt);
+               return true;
        }
 
        hclge_clear_reset_cause(hdev);
@@ -3382,7 +3373,6 @@ static int hclge_reset_stack(struct hclge_dev *hdev)
 static void hclge_reset(struct hclge_dev *hdev)
 {
        struct hnae3_ae_dev *ae_dev = pci_get_drvdata(hdev->pdev);
-       bool is_timeout = false;
        int ret;
 
        /* Initialize ae_dev reset status as well, in case enet layer wants to
@@ -3410,10 +3400,8 @@ static void hclge_reset(struct hclge_dev *hdev)
        if (ret)
                goto err_reset;
 
-       if (hclge_reset_wait(hdev)) {
-               is_timeout = true;
+       if (hclge_reset_wait(hdev))
                goto err_reset;
-       }
 
        hdev->rst_stats.hw_reset_done_cnt++;
 
@@ -3465,7 +3453,7 @@ static void hclge_reset(struct hclge_dev *hdev)
 err_reset_lock:
        rtnl_unlock();
 err_reset:
-       if (hclge_reset_err_handle(hdev, is_timeout))
+       if (hclge_reset_err_handle(hdev))
                hclge_reset_task_schedule(hdev);
 }