From 997350e5c5b79438e68b0fc51507d8ad3752944b Mon Sep 17 00:00:00 2001 From: yuzhitao Date: Mon, 16 Sep 2019 23:31:48 +0800 Subject: [PATCH] net: hns3: solve imp reset fail because of err hw resting driver inclusion category: bugfix bugzilla: NA CVE: NA This commit is dedicated to solve the reset failure when the driver misidentifies the chip reset status. The modification is strongly associated with the one on the function "hclge_get_hw_reset_stat" in hns3/hns3pf/hclge_main.c Signed-off-by: yuzhitao Reviewed-by: liyongxin1 Reviewed-by: dengweiwei Reviewed-by: zhongzhaohui Reviewed-by: chenjunxin Reviewed-by: Yang Yingliang Signed-off-by: Yang Yingliang --- .../hisilicon/hns3/hns-customer/hns3pf/hclge_main_it.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns-customer/hns3pf/hclge_main_it.c b/drivers/net/ethernet/hisilicon/hns3/hns-customer/hns3pf/hclge_main_it.c index 77d45c006d8f..46ab2b1fb78b 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns-customer/hns3pf/hclge_main_it.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns-customer/hns3pf/hclge_main_it.c @@ -120,7 +120,7 @@ void hclge_reset_event_it(struct pci_dev *pdev, struct hnae3_handle *handle) else if (time_after(jiffies, (hdev->last_reset_time + 4 * 5 * HZ))) hdev->reset_level = HNAE3_FUNC_RESET; - dev_info(&hdev->pdev->dev, "received reset event , reset type is %d", + dev_info(&hdev->pdev->dev, "IT received reset event, reset type is %d", hdev->reset_level); if (hdev->ppu_poison_ras_err && nic_event_call) { @@ -146,13 +146,13 @@ bool hclge_reset_done_it(struct hnae3_handle *handle, bool done) netdev = hdev->vport[0].nic.netdev; if (done) { - dev_info(&hdev->pdev->dev, "Report Reset DONE!\n"); + dev_info(&hdev->pdev->dev, "IT Report Reset DONE!\n"); if (nic_event_call) nic_call_event(netdev, HNAE3_RESET_DONE_CUSTOM); } if (hdev->reset_fail_cnt >= HCLGE_RESET_MAX_FAIL_CNT) { - dev_err(&hdev->pdev->dev, "Report Reset fail!\n"); + dev_err(&hdev->pdev->dev, "IT Report Reset fail!\n"); if (nic_event_call) { if (hdev->reset_type == HNAE3_FUNC_RESET) nic_call_event(netdev, -- GitLab