Commit e5b0630a authored by Yufeng Mo's avatar Yufeng Mo Committed by Zheng Zengkai
Browse files

net: hns3: clear unnecessary reset request in hclge_reset_rebuild 

mainline inclusion
from mainline-v5.13-rc1
commit 8c9200e3
category: bugfix
bugzilla: 173966
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8c9200e387721c597baabb319b4bd1cdf1155e35



----------------------------------------------------------------------

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: f6162d44 ("net: hns3: add handling of hw errors reported through MSIX")
Signed-off-by: default avatarYufeng Mo <moyufeng@huawei.com>
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Reviewed-by: default avatarYongxin Li <liyongxin1@huawei.com>
Signed-off-by: default avatarJunxin Chen <chenjunxin1@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 3e26de97

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

+6 −0
Original line number Diff line number Diff line
@@ -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.