From: Marek Vasut <marek.vasut@gmail.com>
To: linux-pci@vger.kernel.org
Cc: Marek Vasut <marek.vasut+renesas@gmail.com>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Phil Edworthy <phil.edworthy@renesas.com>,
Simon Horman <horms+renesas@verge.net.au>,
Wolfram Sang <wsa@the-dreams.de>,
linux-renesas-soc@vger.kernel.org
Subject: [PATCH v4 6/6] PCI: rcar: Shut the PHY down in failpath
Date: Thu, 24 May 2018 16:36:24 +0200 [thread overview]
Message-ID: <20180524143624.26718-7-marek.vasut+renesas@gmail.com> (raw)
In-Reply-To: <20180524143624.26718-1-marek.vasut+renesas@gmail.com>
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.
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
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
Fixes: 517ca93a7159 ("PCI: rcar: Add R-Car gen3 PHY support")
---
V4: New patch
---
drivers/pci/host/pcie-rcar.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
index 636c3c5095d2..695781934f0a 100644
--- a/drivers/pci/host/pcie-rcar.c
+++ b/drivers/pci/host/pcie-rcar.c
@@ -1163,7 +1163,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);
@@ -1175,7 +1175,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;
}
}
@@ -1189,6 +1189,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);
--
2.16.2
next prev parent reply other threads:[~2018-05-24 14:36 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-24 14:36 [PATCH v4 0/6] PCI: rcar: Failpath fixes Marek Vasut
2018-05-24 14:36 ` [PATCH v4 1/6] PCI: rcar: Pull bus clock enable/disable from rcar_pcie_get_resources() Marek Vasut
2018-05-28 8:51 ` Simon Horman
2018-05-24 14:36 ` [PATCH v4 2/6] PCI: rcar: Add missing irq_dispose_mapping() into failpath Marek Vasut
2018-05-28 8:51 ` Simon Horman
2018-05-24 14:36 ` [PATCH v4 3/6] PCI: rcar: Teardown MSI setup if rcar_pcie_enable() fails Marek Vasut
2018-05-28 8:52 ` Simon Horman
2018-05-24 14:36 ` [PATCH v4 4/6] PCI: rcar: Poll more often in rcar_pcie_wait_for_dl() Marek Vasut
2018-05-28 8:53 ` Simon Horman
2018-05-24 14:36 ` [PATCH v4 5/6] PCI: rcar: Remove IRQ mappings in rcar_pcie_enable_msi failpath Marek Vasut
2018-05-28 8:53 ` Simon Horman
2018-05-24 14:36 ` Marek Vasut [this message]
2018-05-25 10:09 ` [PATCH v4 6/6] PCI: rcar: Shut the PHY down in failpath Geert Uytterhoeven
2018-05-25 18:34 ` Marek Vasut
2018-05-28 8:48 ` Simon Horman
2018-06-01 23:30 ` Marek Vasut
2018-06-29 13:38 ` Lorenzo Pieralisi
2018-05-25 9:35 ` [PATCH v4 0/6] PCI: rcar: Failpath fixes Lorenzo Pieralisi
2018-05-25 9:39 ` Geert Uytterhoeven
2018-05-25 9:56 ` Lorenzo Pieralisi
2018-05-25 10:01 ` Geert Uytterhoeven
2018-05-25 16:43 ` Lorenzo Pieralisi
2018-05-25 17:10 ` Marek Vasut
2018-05-28 8:54 ` Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180524143624.26718-7-marek.vasut+renesas@gmail.com \
--to=marek.vasut@gmail.com \
--cc=geert+renesas@glider.be \
--cc=horms+renesas@verge.net.au \
--cc=linux-pci@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=marek.vasut+renesas@gmail.com \
--cc=phil.edworthy@renesas.com \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).