net: hns3: ignore new coming low-level reset while doing high-level reset

When processing a higher level reset, the pending lower level reset
does not have to be processed anymore, because the higher level
reset is the superset of the lower level reset.

Therefore, when processing an higher level reset, the request of
lower level reset needs to be cleared.

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 b784db0..62022d5 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -2414,20 +2414,25 @@ static enum hnae3_reset_type hclge_get_reset_level(struct hclge_dev *hdev,
        enum hnae3_reset_type rst_level = HNAE3_NONE_RESET;
 
        /* return the highest priority reset level amongst all */
-       if (test_bit(HNAE3_GLOBAL_RESET, addr))
+       if (test_bit(HNAE3_IMP_RESET, addr)) {
+               rst_level = HNAE3_IMP_RESET;
+               clear_bit(HNAE3_IMP_RESET, addr);
+               clear_bit(HNAE3_GLOBAL_RESET, addr);
+               clear_bit(HNAE3_CORE_RESET, addr);
+               clear_bit(HNAE3_FUNC_RESET, addr);
+       } else if (test_bit(HNAE3_GLOBAL_RESET, addr)) {
                rst_level = HNAE3_GLOBAL_RESET;
-       else if (test_bit(HNAE3_CORE_RESET, addr))
+               clear_bit(HNAE3_GLOBAL_RESET, addr);
+               clear_bit(HNAE3_CORE_RESET, addr);
+               clear_bit(HNAE3_FUNC_RESET, addr);
+       } else if (test_bit(HNAE3_CORE_RESET, addr)) {
                rst_level = HNAE3_CORE_RESET;
-       else if (test_bit(HNAE3_IMP_RESET, addr))
-               rst_level = HNAE3_IMP_RESET;
-       else if (test_bit(HNAE3_FUNC_RESET, addr))
+               clear_bit(HNAE3_CORE_RESET, addr);
+               clear_bit(HNAE3_FUNC_RESET, addr);
+       } else if (test_bit(HNAE3_FUNC_RESET, addr)) {
                rst_level = HNAE3_FUNC_RESET;
-
-       /* now, clear all other resets */
-       clear_bit(HNAE3_GLOBAL_RESET, addr);
-       clear_bit(HNAE3_CORE_RESET, addr);
-       clear_bit(HNAE3_IMP_RESET, addr);
-       clear_bit(HNAE3_FUNC_RESET, addr);
+               clear_bit(HNAE3_FUNC_RESET, addr);
+       }
 
        return rst_level;
 }