From 7c4638cda355b86299cfd128fc190f7fd10e7950 Mon Sep 17 00:00:00 2001 From: gaoxun3 Date: Mon, 16 Sep 2019 23:31:49 +0800 Subject: [PATCH] net: hns3: fix driver misidentify chip reset state 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/hns-customer/hns3pf/hclge_main_it.c Signed-off-by: gaoxun3 Reviewed-by: liyongxin1 Reviewed-by: dengweiwei Reviewed-by: zhongzhaohui Reviewed-by: chenjunxin Reviewed-by: Yang Yingliang Signed-off-by: Yang Yingliang --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 3a0282572a6c..aa3ccc48bbd0 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -6262,7 +6262,7 @@ static bool hclge_get_hw_reset_stat(struct hnae3_handle *handle) struct hclge_dev *hdev = vport->back; return hclge_read_dev(&hdev->hw, HCLGE_GLOBAL_RESET_REG) || - hclge_read_dev(&hdev->hw, HCLGE_FUN_RST_ING); + (hclge_read_dev(&hdev->hw, HCLGE_FUN_RST_ING) & BIT(0)); } static bool hclge_ae_dev_resetting(struct hnae3_handle *handle) -- GitLab