net: hns3: clear unnecessary reset request in hclge_reset_rebuild

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: e9e8fadb6d46 ("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>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index c296ab64fb0a1b41ba53a806e2f8fe90f1d8a602..6304aed49f224389bcb2120a263bad88a46dc945 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -3978,6 +3978,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.