net: hns3: check reset interrupt status when reset fails

Currently, the reset interrupt will be cleared firstly, so when
reset fails, if interrupt status register has reset interrupt,
it means there is a new coming reset.

Fixes: 70fbd6b4a837 ("net: hns3: clear reset interrupt status in hclge_irq_handle()")
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Reviewed-by: Peng Li <lipeng321@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 428f7c0d208194c0857c7a7aa6b9134b45f8bbec..dc22b84641a7ed6b464f54803579ae9327dc06af 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -3536,11 +3536,10 @@ static bool hclge_reset_err_handle(struct hclge_dev *hdev)
                dev_info(&hdev->pdev->dev, "Reset pending %lu\n",
                         hdev->reset_pending);
                return true;
-       } else if ((hdev->reset_type != HNAE3_IMP_RESET) &&
-                  (hclge_read_dev(&hdev->hw, HCLGE_GLOBAL_RESET_REG) &
-                   BIT(HCLGE_IMP_RESET_BIT))) {
+       } else if (hclge_read_dev(&hdev->hw, HCLGE_MISC_VECTOR_INT_STS) &
+                  HCLGE_RESET_INT_M) {
                dev_info(&hdev->pdev->dev,
-                        "reset failed because IMP Reset is pending\n");
+                        "reset failed because new reset interrupt\n");
                hclge_clear_reset_cause(hdev);
                return false;
        } else if (hdev->reset_fail_cnt < MAX_RESET_FAIL_CNT) {

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
index a3bc382926bb0103c81630ba8035b289afed9d77..437a9ff8f58807a884cb9f0536a27989b44bbc35 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
@@ -164,6 +164,7 @@ enum HLCGE_PORT_TYPE {
 #define HCLGE_GLOBAL_RESET_BIT         0
 #define HCLGE_CORE_RESET_BIT           1
 #define HCLGE_IMP_RESET_BIT            2
+#define HCLGE_RESET_INT_M              GENMASK(2, 0)
 #define HCLGE_FUN_RST_ING              0x20C00
 #define HCLGE_FUN_RST_ING_B            0