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 1/6] PCI: rcar: Pull bus clock enable/disable from rcar_pcie_get_resources()
Date: Thu, 24 May 2018 16:36:19 +0200 [thread overview]
Message-ID: <20180524143624.26718-2-marek.vasut+renesas@gmail.com> (raw)
In-Reply-To: <20180524143624.26718-1-marek.vasut+renesas@gmail.com>
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.
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
---
V2: No change
V3: No change
V4: Rebase on top of Lorenzo's pci/rcar, fix up the rebase breakage
induced by patches therein
---
drivers/pci/host/pcie-rcar.c | 33 ++++++++++++++++-----------------
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
index 8d161563bce8..0879880f7975 100644
--- a/drivers/pci/host/pcie-rcar.c
+++ b/drivers/pci/host/pcie-rcar.c
@@ -946,32 +946,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,
@@ -1115,22 +1105,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);
@@ -1142,16 +1138,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);
--
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 ` Marek Vasut [this message]
2018-05-28 8:51 ` [PATCH v4 1/6] PCI: rcar: Pull bus clock enable/disable from rcar_pcie_get_resources() 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 ` [PATCH v4 6/6] PCI: rcar: Shut the PHY down in failpath Marek Vasut
2018-05-25 10:09 ` 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-2-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).