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

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

net: hns3: Fixes the error legs in hclge_init_ae_dev function 



This patch fixes some of the missed error legs in the initialization
function of the ae device. This might cause leaks in case of failure.

Fixes: 46a3df9f ("net: hns3: Add HNS3 Acceleration Engine & Compatibility Layer
Support")
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarSalil Mehta <salil.mehta@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 38e62046

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

+34 −21
Original line number Diff line number Diff line
@@ -5430,7 +5430,7 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev) 
	hdev = devm_kzalloc(&pdev->dev, sizeof(*hdev), GFP_KERNEL);

	if (!hdev) {

		ret = -ENOMEM;

		goto err_hclge_dev;

		goto out;

	}



	hdev->pdev = pdev;
@@ -5443,38 +5443,38 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev) 
	ret = hclge_pci_init(hdev);

	if (ret) {

		dev_err(&pdev->dev, "PCI init failed\n");

		goto err_pci_init;

		goto out;

	}



	/* Firmware command queue initialize */

	ret = hclge_cmd_queue_init(hdev);

	if (ret) {

		dev_err(&pdev->dev, "Cmd queue init failed, ret = %d.\n", ret);

		return ret;

		goto err_pci_uninit;

	}



	/* Firmware command initialize */

	ret = hclge_cmd_init(hdev);

	if (ret)

		goto err_cmd_init;

		goto err_cmd_uninit;



	ret = hclge_get_cap(hdev);

	if (ret) {

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

			ret);

		return ret;

		goto err_cmd_uninit;

	}



	ret = hclge_configure(hdev);

	if (ret) {

		dev_err(&pdev->dev, "Configure dev error, ret = %d.\n", ret);

		return ret;

		goto err_cmd_uninit;

	}



	ret = hclge_init_msi(hdev);

	if (ret) {

		dev_err(&pdev->dev, "Init MSI/MSI-X error, ret = %d.\n", ret);

		return ret;

		goto err_cmd_uninit;

	}



	ret = hclge_misc_irq_init(hdev);
@@ -5482,69 +5482,69 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev) 
		dev_err(&pdev->dev,

			"Misc IRQ(vector0) init error, ret = %d.\n",

			ret);

		return ret;

		goto err_msi_uninit;

	}



	ret = hclge_alloc_tqps(hdev);

	if (ret) {

		dev_err(&pdev->dev, "Allocate TQPs error, ret = %d.\n", ret);

		return ret;

		goto err_msi_irq_uninit;

	}



	ret = hclge_alloc_vport(hdev);

	if (ret) {

		dev_err(&pdev->dev, "Allocate vport error, ret = %d.\n", ret);

		return ret;

		goto err_msi_irq_uninit;

	}



	ret = hclge_map_tqp(hdev);

	if (ret) {

		dev_err(&pdev->dev, "Map tqp error, ret = %d.\n", ret);

		return ret;

		goto err_sriov_disable;

	}



	ret = hclge_mac_mdio_config(hdev);

	if (ret) {

		dev_warn(&hdev->pdev->dev,

			 "mdio config fail ret=%d\n", ret);

		return ret;

		goto err_sriov_disable;

	}



	ret = hclge_mac_init(hdev);

	if (ret) {

		dev_err(&pdev->dev, "Mac init error, ret = %d\n", ret);

		return ret;

		goto err_mdiobus_unreg;

	}



	ret = hclge_config_tso(hdev, HCLGE_TSO_MSS_MIN, HCLGE_TSO_MSS_MAX);

	if (ret) {

		dev_err(&pdev->dev, "Enable tso fail, ret =%d\n", ret);

		return ret;

		goto err_mdiobus_unreg;

	}



	ret = hclge_init_vlan_config(hdev);

	if (ret) {

		dev_err(&pdev->dev, "VLAN init fail, ret =%d\n", ret);

		return  ret;

		goto err_mdiobus_unreg;

	}



	ret = hclge_tm_schd_init(hdev);

	if (ret) {

		dev_err(&pdev->dev, "tm schd init fail, ret =%d\n", ret);

		return ret;

		goto err_mdiobus_unreg;

	}



	hclge_rss_init_cfg(hdev);

	ret = hclge_rss_init_hw(hdev);

	if (ret) {

		dev_err(&pdev->dev, "Rss init fail, ret =%d\n", ret);

		return ret;

		goto err_mdiobus_unreg;

	}



	ret = init_mgr_tbl(hdev);

	if (ret) {

		dev_err(&pdev->dev, "manager table init fail, ret =%d\n", ret);

		return ret;

		goto err_mdiobus_unreg;

	}



	hclge_dcb_ops_set(hdev);
@@ -5567,11 +5567,24 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev) 
	pr_info("%s driver initialization finished.\n", HCLGE_DRIVER_NAME);

	return 0;



err_cmd_init:

err_mdiobus_unreg:

	if (hdev->hw.mac.phydev)

		mdiobus_unregister(hdev->hw.mac.mdio_bus);

err_sriov_disable:

	if (IS_ENABLED(CONFIG_PCI_IOV))

		hclge_disable_sriov(hdev);

err_msi_irq_uninit:

	hclge_misc_irq_uninit(hdev);

err_msi_uninit:

	pci_free_irq_vectors(pdev);

err_cmd_uninit:

	hclge_destroy_cmd_queue(&hdev->hw);

err_pci_uninit:

	pci_clear_master(pdev);

	pci_release_regions(pdev);

err_pci_init:

	pci_disable_device(pdev);

	pci_set_drvdata(pdev, NULL);

err_hclge_dev:

out:

	return ret;

}