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

Commit 4050360f authored by Marek Vasut's avatar Marek Vasut Committed by Bjorn Helgaas
Browse files

PCI: rcar: Shut the PHY down in failpath 



If anything fails past phy_init_fn() and the system is a Gen3 with
a PHY, the PHY will be left on and inited. This is caused by the
phy_init_fn, which is in fact a pointer to rcar_pcie_phy_init_gen3()
function, which starts the PHY, yet has no counterpart in the failpath.
Add that counterpart.

Fixes: 517ca93a ("PCI: rcar: Add R-Car gen3 PHY support")
Signed-off-by: default avatarMarek Vasut <marek.vasut+renesas@gmail.com>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Phil Edworthy <phil.edworthy@renesas.com>
Cc: Wolfram Sang <wsa@the-dreams.de>
parent 925d3166

drivers/pci/controller/pcie-rcar.c

+8 −2
Original line number Diff line number Diff line
@@ -1165,7 +1165,7 @@ static int rcar_pcie_probe(struct platform_device *pdev) 
	if (rcar_pcie_hw_init(pcie)) {

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

		err = -ENODEV;

		goto err_clk_disable;

		goto err_phy_shutdown;

	}



	data = rcar_pci_read_reg(pcie, MACSR);
@@ -1177,7 +1177,7 @@ static int rcar_pcie_probe(struct platform_device *pdev) 
			dev_err(dev,

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

				err);

			goto err_clk_disable;

			goto err_phy_shutdown;

		}

	}
@@ -1191,6 +1191,12 @@ static int rcar_pcie_probe(struct platform_device *pdev) 
	if (IS_ENABLED(CONFIG_PCI_MSI))

		rcar_pcie_teardown_msi(pcie);



err_phy_shutdown:

	if (pcie->phy) {

		phy_power_off(pcie->phy);

		phy_exit(pcie->phy);

	}



err_clk_disable:

	clk_disable_unprepare(pcie->bus_clk);