Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 951805c2 authored by Yufeng Mo's avatar Yufeng Mo Committed by Greg Kroah-Hartman
Browse files

net: hns3: clear hardware resource when loading driver 



[ Upstream commit 1a6d281946c330cee2855f6d0cd796616e54601f ]

If a PF is bonded to a virtual machine and the virtual machine exits
unexpectedly, some hardware resource cannot be cleared. In this case,
loading driver may cause exceptions. Therefore, the hardware resource
needs to be cleared when the driver is loaded.

Fixes: 46a3df9f ("net: hns3: Add HNS3 Acceleration Engine & Compatibility Layer Support")
Signed-off-by: default avatarYufeng Mo <moyufeng@huawei.com>
Signed-off-by: default avatarSalil Mehta <salil.mehta@huawei.com>
Signed-off-by: default avatarGuangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 08162f65

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h

+3 −0
Original line number Diff line number Diff line
@@ -257,6 +257,9 @@ enum hclge_opcode_type { 
	/* Led command */

	HCLGE_OPC_LED_STATUS_CFG	= 0xB000,



	/* clear hardware resource command */

	HCLGE_OPC_CLEAR_HW_RESOURCE	= 0x700B,



	/* NCL config command */

	HCLGE_OPC_QUERY_NCL_CONFIG	= 0x7011,

	/* M7 stats command */

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

+26 −0
Original line number Diff line number Diff line
@@ -9165,6 +9165,28 @@ static void hclge_clear_resetting_state(struct hclge_dev *hdev) 
	}

}



static int hclge_clear_hw_resource(struct hclge_dev *hdev)

{

	struct hclge_desc desc;

	int ret;



	hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_CLEAR_HW_RESOURCE, false);



	ret = hclge_cmd_send(&hdev->hw, &desc, 1);

	/* This new command is only supported by new firmware, it will

	 * fail with older firmware. Error value -EOPNOSUPP can only be

	 * returned by older firmware running this command, to keep code

	 * backward compatible we will override this value and return

	 * success.

	 */

	if (ret && ret != -EOPNOTSUPP) {

		dev_err(&hdev->pdev->dev,

			"failed to clear hw resource, ret = %d\n", ret);

		return ret;

	}

	return 0;

}



static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)

{

	struct pci_dev *pdev = ae_dev->pdev;
@@ -9206,6 +9228,10 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev) 
	if (ret)

		goto err_cmd_uninit;



	ret  = hclge_clear_hw_resource(hdev);

	if (ret)

		goto err_cmd_uninit;



	ret = hclge_get_cap(hdev);

	if (ret) {

		dev_err(&pdev->dev, "get hw capability error, ret = %d.\n",