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

Commit 80b8471e authored by Marek Vasut's avatar Marek Vasut Committed by Lorenzo Pieralisi
Browse files

PCI: rcar: Pull bus clock enable/disable from rcar_pcie_get_resources() 



The rcar_pcie_get_resources() is another misnomer with a side effect.
The function does not only get resources, but also enables/disables bus
clock. This is forgotten in the probe() function though and if anything
in probe() fails after rcar_pcie_get_resources() is called, the bus
clock are never disabled.

This patch pulls the clock handling out of the rcar_pcie_get_resources()
and enables clock after all the resources were requested. Moreover, this
patch also always disables the clock in case of failure.

Reported-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarMarek Vasut <marek.vasut+renesas@gmail.com>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Phil Edworthy <phil.edworthy@renesas.com>
Cc: Simon Horman <horms+renesas@verge.net.au>
Cc: Wolfram Sang <wsa@the-dreams.de>
Cc: linux-renesas-soc@vger.kernel.org
parent 0353ff29

drivers/pci/host/pcie-rcar.c

+16 −17
Original line number Diff line number Diff line
@@ -947,32 +947,22 @@ static int rcar_pcie_get_resources(struct rcar_pcie *pcie) 
		dev_err(dev, "cannot get pcie bus clock\n");

		return PTR_ERR(pcie->bus_clk);

	}

	err = clk_prepare_enable(pcie->bus_clk);

	if (err)

		return err;



	i = irq_of_parse_and_map(dev->of_node, 0);

	if (!i) {

		dev_err(dev, "cannot get platform resources for msi interrupt\n");

		err = -ENOENT;

		goto err_map_reg;

		return -ENOENT;

	}

	pcie->msi.irq1 = i;



	i = irq_of_parse_and_map(dev->of_node, 1);

	if (!i) {

		dev_err(dev, "cannot get platform resources for msi interrupt\n");

		err = -ENOENT;

		goto err_map_reg;

		return -ENOENT;

	}

	pcie->msi.irq2 = i;



	return 0;



err_map_reg:

	clk_disable_unprepare(pcie->bus_clk);



	return err;

}



static int rcar_pcie_inbound_ranges(struct rcar_pcie *pcie,
@@ -1116,22 +1106,28 @@ static int rcar_pcie_probe(struct platform_device *pdev) 
		goto err_pm_put;

	}



	err = clk_prepare_enable(pcie->bus_clk);

	if (err) {

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

		goto err_pm_put;

	}



	err = rcar_pcie_parse_map_dma_ranges(pcie, dev->of_node);

	if (err)

		goto err_pm_put;

		goto err_clk_disable;



	phy_init_fn = of_device_get_match_data(dev);

	err = phy_init_fn(pcie);

	if (err) {

		dev_err(dev, "failed to init PCIe PHY\n");

		goto err_pm_put;

		goto err_clk_disable;

	}



	/* Failure to get a link might just be that no cards are inserted */

	if (rcar_pcie_hw_init(pcie)) {

		dev_info(dev, "PCIe link down\n");

		err = -ENODEV;

		goto err_pm_put;

		goto err_clk_disable;

	}



	data = rcar_pci_read_reg(pcie, MACSR);
@@ -1143,16 +1139,19 @@ static int rcar_pcie_probe(struct platform_device *pdev) 
			dev_err(dev,

				"failed to enable MSI support: %d\n",

				err);

			goto err_pm_put;

			goto err_clk_disable;

		}

	}



	err = rcar_pcie_enable(pcie);

	if (err)

		goto err_pm_put;

		goto err_clk_disable;



	return 0;



err_clk_disable:

	clk_disable_unprepare(pcie->bus_clk);



err_pm_put:

	pm_runtime_put(dev);