From: Herve Codina <herve.codina@bootlin.com>
To: "Marek Vasut" <marek.vasut+renesas@gmail.com>,
"Yoshihiro Shimoda" <yoshihiro.shimoda.uh@renesas.com>,
"Bjorn Helgaas" <bhelgaas@google.com>,
"Rob Herring" <robh+dt@kernel.org>,
"Krzysztof Kozlowski" <krzk+dt@kernel.org>,
"Geert Uytterhoeven" <geert+renesas@glider.be>,
"Magnus Damm" <magnus.damm@gmail.com>,
"Lorenzo Pieralisi" <lorenzo.pieralisi@arm.com>,
"Krzysztof Wilczyński" <kw@linux.com>
Cc: Rob Herring <robh@kernel.org>,
linux-pci@vger.kernel.org, linux-renesas-soc@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
Sergey Shtylyov <s.shtylyov@omp.ru>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Clement Leger <clement.leger@bootlin.com>,
Miquel Raynal <miquel.raynal@bootlin.com>,
Herve Codina <herve.codina@bootlin.com>
Subject: [PATCH v2 1/8] PCI: rcar-gen2: Add support for clocks
Date: Thu, 14 Apr 2022 09:40:04 +0200 [thread overview]
Message-ID: <20220414074011.500533-2-herve.codina@bootlin.com> (raw)
In-Reply-To: <20220414074011.500533-1-herve.codina@bootlin.com>
The PCI rcar-gen2 does not call any clk_prepare_enable().
This lead to an access failure when the driver tries to access
the IP (at least on a RZ/N1D platform).
Prepare and enable clocks using the bulk version of
clk_prepare_enable() in order to prepare and enable all clocks
attached to this device.
Signed-off-by: Herve Codina <herve.codina@bootlin.com>
---
drivers/pci/controller/pci-rcar-gen2.c | 28 ++++++++++++++++++++++++--
1 file changed, 26 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/controller/pci-rcar-gen2.c b/drivers/pci/controller/pci-rcar-gen2.c
index 35804ea394fd..528bc3780e01 100644
--- a/drivers/pci/controller/pci-rcar-gen2.c
+++ b/drivers/pci/controller/pci-rcar-gen2.c
@@ -8,6 +8,7 @@
* Author: Valentine Barshak <valentine.barshak@cogentembedded.com>
*/
+#include <linux/clk.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/interrupt.h>
@@ -99,6 +100,8 @@ struct rcar_pci {
struct resource mem_res;
struct resource *cfg_res;
int irq;
+ struct clk_bulk_data *clocks;
+ int nclocks;
};
/* PCI configuration space operations */
@@ -282,6 +285,7 @@ static int rcar_pci_probe(struct platform_device *pdev)
struct rcar_pci *priv;
struct pci_host_bridge *bridge;
void __iomem *reg;
+ int ret;
bridge = devm_pci_alloc_host_bridge(dev, sizeof(*priv));
if (!bridge)
@@ -305,13 +309,25 @@ static int rcar_pci_probe(struct platform_device *pdev)
priv->mem_res = *mem_res;
priv->cfg_res = cfg_res;
+ ret = devm_clk_bulk_get_all(dev, &priv->clocks);
+ if (ret < 0) {
+ dev_err(dev, "failed to get clocks %d\n", ret);
+ return ret;
+ }
+ priv->nclocks = ret;
+
+ ret = clk_bulk_prepare_enable(priv->nclocks, priv->clocks);
+ if (ret)
+ return ret;
+
priv->irq = platform_get_irq(pdev, 0);
priv->reg = reg;
priv->dev = dev;
if (priv->irq < 0) {
dev_err(dev, "no valid irq found\n");
- return priv->irq;
+ ret = priv->irq;
+ goto disable_clocks;
}
bridge->ops = &rcar_pci_ops;
@@ -320,7 +336,15 @@ static int rcar_pci_probe(struct platform_device *pdev)
rcar_pci_setup(priv);
- return pci_host_probe(bridge);
+ ret = pci_host_probe(bridge);
+ if (ret < 0)
+ goto disable_clocks;
+
+ return 0;
+
+disable_clocks:
+ clk_bulk_disable_unprepare(priv->nclocks, priv->clocks);
+ return ret;
}
static const struct of_device_id rcar_pci_of_match[] = {
--
2.35.1
next prev parent reply other threads:[~2022-04-14 7:40 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-14 7:40 [PATCH v2 0/8] RZN1 USB Host support Herve Codina
2022-04-14 7:40 ` Herve Codina [this message]
2022-04-14 8:45 ` [PATCH v2 1/8] PCI: rcar-gen2: Add support for clocks Geert Uytterhoeven
2022-04-14 11:29 ` Herve Codina
2022-04-14 11:48 ` Geert Uytterhoeven
2022-04-14 13:42 ` Herve Codina
2022-04-14 7:40 ` [PATCH v2 2/8] dt-bindings: PCI: renesas-pci-usb: Convert bindings to json-schema Herve Codina
2022-04-14 8:08 ` Miquel Raynal
2022-04-14 8:28 ` Geert Uytterhoeven
2022-04-19 14:41 ` Herve Codina
2022-04-14 18:15 ` Rob Herring
2022-04-20 12:44 ` Herve Codina
2022-04-20 13:18 ` Rob Herring
2022-04-20 13:46 ` Herve Codina
2022-04-20 21:37 ` Rob Herring
2022-04-14 7:40 ` [PATCH v2 3/8] dt-bindings: PCI: renesas-pci-usb: Allow multiple clocks Herve Codina
2022-04-14 8:35 ` Geert Uytterhoeven
2022-04-20 13:07 ` Herve Codina
2022-04-20 13:24 ` Rob Herring
2022-04-20 14:55 ` Herve Codina
2022-04-20 13:32 ` Geert Uytterhoeven
2022-04-20 14:56 ` Herve Codina
2022-04-14 7:40 ` [PATCH v2 4/8] dt-bindings: PCI: renesas-pci-usb: Add device tree support for r9a06g032 Herve Codina
2022-04-14 7:40 ` [PATCH v2 5/8] PCI: rcar-gen2: Add R9A06G032 support Herve Codina
2022-04-14 7:40 ` [PATCH v2 6/8] ARM: dts: r9a06g032: Add internal PCI bridge node Herve Codina
2022-04-18 9:02 ` Sergey Shtylyov
2022-04-20 13:19 ` Herve Codina
2022-04-20 19:56 ` Rob Herring
2022-04-14 7:40 ` [PATCH v2 7/8] ARM: dts: r9a06g032: Add USB PHY DT support Herve Codina
2022-04-14 7:40 ` [PATCH v2 8/8] ARM: dts: r9a06g032: Link the PCI USB devices to the USB PHY Herve Codina
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=20220414074011.500533-2-herve.codina@bootlin.com \
--to=herve.codina@bootlin.com \
--cc=bhelgaas@google.com \
--cc=clement.leger@bootlin.com \
--cc=devicetree@vger.kernel.org \
--cc=geert+renesas@glider.be \
--cc=krzk+dt@kernel.org \
--cc=kw@linux.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=magnus.damm@gmail.com \
--cc=marek.vasut+renesas@gmail.com \
--cc=miquel.raynal@bootlin.com \
--cc=robh+dt@kernel.org \
--cc=robh@kernel.org \
--cc=s.shtylyov@omp.ru \
--cc=thomas.petazzoni@bootlin.com \
--cc=yoshihiro.shimoda.uh@renesas.com \
/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).