Commit 527557a4 authored by Manikanta Maddireddy's avatar Manikanta Maddireddy Committed by Lorenzo Pieralisi
Browse files

PCI: tegra: Free resources on probe failure 



tegra_pcie_probe() can fail in multiple instances, this patch takes care
of freeing the resources which are allocated before probe fail.

Signed-off-by: default avatarManikanta Maddireddy <mmaddireddy@nvidia.com>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: default avatarThierry Reding <treding@nvidia.com>
Tested-by: default avatarThierry Reding <treding@nvidia.com>
parent 7928b2cb

drivers/pci/host/pci-tegra.c

+79 −20
Original line number Diff line number Diff line
@@ -549,14 +549,25 @@ static int tegra_pcie_request_resources(struct tegra_pcie *pcie) 
	pci_add_resource(windows, &pcie->busn);



	err = devm_request_pci_bus_resources(dev, windows);

	if (err < 0)

	if (err < 0) {

		pci_free_resource_list(windows);

		return err;

	}



	pci_remap_iospace(&pcie->pio, pcie->io.start);



	return 0;

}



static void tegra_pcie_free_resources(struct tegra_pcie *pcie)

{

	struct pci_host_bridge *host = pci_host_bridge_from_priv(pcie);

	struct list_head *windows = &host->windows;



	pci_unmap_iospace(&pcie->pio);

	pci_free_resource_list(windows);

}



static int tegra_pcie_map_irq(const struct pci_dev *pdev, u8 slot, u8 pin)

{

	struct tegra_pcie *pcie = pdev->bus->sysdata;
@@ -966,24 +977,35 @@ static int tegra_pcie_enable_controller(struct tegra_pcie *pcie) 
	return 0;

}



static void tegra_pcie_power_off(struct tegra_pcie *pcie)

static void tegra_pcie_disable_controller(struct tegra_pcie *pcie)

{

	struct device *dev = pcie->dev;

	const struct tegra_pcie_soc *soc = pcie->soc;

	int err;



	/* TODO: disable and unprepare clocks? */

	reset_control_assert(pcie->pcie_xrst);



	if (soc->program_uphy) {

	if (pcie->soc->program_uphy) {

		err = tegra_pcie_phy_power_off(pcie);

		if (err < 0)

			dev_err(dev, "failed to power off PHY(s): %d\n", err);

			dev_err(pcie->dev, "failed to power off PHY(s): %d\n",

				err);

	}

}



	reset_control_assert(pcie->pcie_xrst);

static void tegra_pcie_power_off(struct tegra_pcie *pcie)

{

	struct device *dev = pcie->dev;

	const struct tegra_pcie_soc *soc = pcie->soc;

	int err;



	reset_control_assert(pcie->afi_rst);

	reset_control_assert(pcie->pex_rst);



	clk_disable_unprepare(pcie->pll_e);

	if (soc->has_cml_clk)

		clk_disable_unprepare(pcie->cml_clk);

	clk_disable_unprepare(pcie->afi_clk);

	clk_disable_unprepare(pcie->pex_clk);



	if (!dev->pm_domain)

		tegra_powergate_power_off(TEGRA_POWERGATE_PCIE);
@@ -1192,6 +1214,30 @@ static int tegra_pcie_phys_get(struct tegra_pcie *pcie) 
	return 0;

}



static void tegra_pcie_phys_put(struct tegra_pcie *pcie)

{

	struct tegra_pcie_port *port;

	struct device *dev = pcie->dev;

	int err, i;



	if (pcie->legacy_phy) {

		err = phy_exit(pcie->phy);

		if (err < 0)

			dev_err(dev, "failed to teardown PHY: %d\n", err);

		return;

	}



	list_for_each_entry(port, &pcie->ports, list) {

		for (i = 0; i < port->lanes; i++) {

			err = phy_exit(port->phys[i]);

			if (err < 0)

				dev_err(dev, "failed to teardown PHY#%u: %d\n",

					i, err);

		}

	}

}





static int tegra_pcie_get_resources(struct tegra_pcie *pcie)

{

	struct device *dev = pcie->dev;
@@ -1223,7 +1269,7 @@ static int tegra_pcie_get_resources(struct tegra_pcie *pcie) 
	err = tegra_pcie_power_on(pcie);

	if (err) {

		dev_err(dev, "failed to power up: %d\n", err);

		return err;

		goto phys_put;

	}



	pads = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pads");
@@ -1275,6 +1321,9 @@ static int tegra_pcie_get_resources(struct tegra_pcie *pcie) 


	return 0;



phys_put:

	if (soc->program_uphy)

		tegra_pcie_phys_put(pcie);

poweroff:

	tegra_pcie_power_off(pcie);

	return err;
@@ -1282,20 +1331,15 @@ poweroff: 


static int tegra_pcie_put_resources(struct tegra_pcie *pcie)

{

	struct device *dev = pcie->dev;

	const struct tegra_pcie_soc *soc = pcie->soc;

	int err;



	if (pcie->irq > 0)

		free_irq(pcie->irq, pcie);



	tegra_pcie_power_off(pcie);



	if (soc->program_uphy) {

		err = phy_exit(pcie->phy);

		if (err < 0)

			dev_err(dev, "failed to teardown PHY: %d\n", err);

	}

	if (soc->program_uphy)

		tegra_pcie_phys_put(pcie);



	return 0;

}
@@ -2035,6 +2079,16 @@ static void tegra_pcie_enable_ports(struct tegra_pcie *pcie) 
	}

}



static void tegra_pcie_disable_ports(struct tegra_pcie *pcie)

{

	struct tegra_pcie_port *port, *tmp;



	list_for_each_entry_safe(port, tmp, &pcie->ports, list) {

		tegra_pcie_port_disable(port);

		tegra_pcie_port_free(port);

	}

}



static const struct tegra_pcie_soc tegra20_pcie = {

	.num_ports = 2,

	.msi_base_shift = 0,
@@ -2265,7 +2319,7 @@ static int tegra_pcie_probe(struct platform_device *pdev) 


	err = tegra_pcie_request_resources(pcie);

	if (err)

		goto put_resources;

		goto disable_controller;



	/* setup the AFI address translations */

	tegra_pcie_setup_translations(pcie);
@@ -2274,7 +2328,7 @@ static int tegra_pcie_probe(struct platform_device *pdev) 
		err = tegra_pcie_enable_msi(pcie);

		if (err < 0) {

			dev_err(dev, "failed to enable MSI support: %d\n", err);

			goto put_resources;

			goto free_resources;

		}

	}
@@ -2289,7 +2343,7 @@ static int tegra_pcie_probe(struct platform_device *pdev) 
	err = pci_scan_root_bus_bridge(host);

	if (err < 0) {

		dev_err(dev, "failed to register host: %d\n", err);

		goto disable_msi;

		goto disable_ports;

	}



	pci_bus_size_bridges(host->bus);
@@ -2308,9 +2362,14 @@ static int tegra_pcie_probe(struct platform_device *pdev) 


	return 0;



disable_msi:

disable_ports:

	tegra_pcie_disable_ports(pcie);

	if (IS_ENABLED(CONFIG_PCI_MSI))

		tegra_pcie_disable_msi(pcie);

free_resources:

	tegra_pcie_free_resources(pcie);

disable_controller:

	tegra_pcie_disable_controller(pcie);

put_resources:

	tegra_pcie_put_resources(pcie);

	return err;

CRA Git | Maintained and supported by SUSTech CRA and CCSE