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

Commit 4339ef39 authored by Huazhong Tan's avatar Huazhong Tan Committed by David S. Miller
Browse files

net: hns3: add error handler for initializing command queue 



This patch adds error handler for the failure of command queue
initialization both PF and VF.

Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 18e24888

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

+8 −3
Original line number Diff line number Diff line
@@ -373,21 +373,26 @@ int hclge_cmd_init(struct hclge_dev *hdev) 
	 * reset may happen when lower level reset is being processed.

	 */

	if ((hclge_is_reset_pending(hdev))) {

		set_bit(HCLGE_STATE_CMD_DISABLE, &hdev->state);

		return -EBUSY;

		ret = -EBUSY;

		goto err_cmd_init;

	}



	ret = hclge_cmd_query_firmware_version(&hdev->hw, &version);

	if (ret) {

		dev_err(&hdev->pdev->dev,

			"firmware version query failed %d\n", ret);

		return ret;

		goto err_cmd_init;

	}

	hdev->fw_version = version;



	dev_info(&hdev->pdev->dev, "The firmware version is %08x\n", version);



	return 0;



err_cmd_init:

	set_bit(HCLGE_STATE_CMD_DISABLE, &hdev->state);



	return ret;

}



static void hclge_cmd_uninit_regs(struct hclge_hw *hw)

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c

+8 −3
Original line number Diff line number Diff line
@@ -357,8 +357,8 @@ int hclgevf_cmd_init(struct hclgevf_dev *hdev) 
	 * reset may happen when lower level reset is being processed.

	 */

	if (hclgevf_is_reset_pending(hdev)) {

		set_bit(HCLGEVF_STATE_CMD_DISABLE, &hdev->state);

		return -EBUSY;

		ret = -EBUSY;

		goto err_cmd_init;

	}



	/* get firmware version */
@@ -366,13 +366,18 @@ int hclgevf_cmd_init(struct hclgevf_dev *hdev) 
	if (ret) {

		dev_err(&hdev->pdev->dev,

			"failed(%d) to query firmware version\n", ret);

		return ret;

		goto err_cmd_init;

	}

	hdev->fw_version = version;



	dev_info(&hdev->pdev->dev, "The firmware version is %08x\n", version);



	return 0;



err_cmd_init:

	set_bit(HCLGEVF_STATE_CMD_DISABLE, &hdev->state);



	return ret;

}



static void hclgevf_cmd_uninit_regs(struct hclgevf_hw *hw)