net: hns3: add error handler for initializing command queue

[ Upstream commit 4339ef396ab65a61f7f22f36d7ba94b6e9e0939b ]

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

Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c
index e483a6e730e6487bee7777d5ec8adffcb0117304..87fa4787bb761345219eb747751cd62ed18db7b8 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c
@@ -359,21 +359,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_destroy_queue(struct hclge_cmq_ring *ring)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c
index b39ff5555a30e6593a4a3ca4e6587358356a4dbd..1e7df81c95ade63d94e6efdecf839565cae25100 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c
@@ -344,8 +344,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 */
@@ -353,13 +353,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;
 }
 
 void hclgevf_cmd_uninit(struct hclgevf_dev *hdev)