* [PATCH] PCI: rcar: Use runtime PM to control controller clock
@ 2017-11-08 9:19 Marek Vasut
2017-11-08 9:36 ` Geert Uytterhoeven
0 siblings, 1 reply; 3+ messages in thread
From: Marek Vasut @ 2017-11-08 9:19 UTC (permalink / raw)
To: linux-pci
Cc: Dien Pham, Hien Dang, Marek Vasut, Geert Uytterhoeven,
Simon Horman, Wolfram Sang, linux-renesas-soc
From: Dien Pham <dien.pham.ry@rvc.renesas.com>
The controller clock can be switched off during suspend/resume,
let runtime PM take care of that.
Signed-off-by: Dien Pham <dien.pham.ry@rvc.renesas.com>
Signed-off-by: Hien Dang <hien.dang.eb@renesas.com>
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Simon Horman <horms+renesas@verge.net.au>
Cc: Wolfram Sang <wsa@the-dreams.de>
Cc: linux-renesas-soc@vger.kernel.org
---
drivers/pci/host/pcie-rcar.c | 25 +++++++------------------
1 file changed, 7 insertions(+), 18 deletions(-)
diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
index 8b51208875fc..889603783f01 100644
--- a/drivers/pci/host/pcie-rcar.c
+++ b/drivers/pci/host/pcie-rcar.c
@@ -145,7 +145,6 @@ struct rcar_pcie {
void __iomem *base;
struct list_head resources;
int root_bus_nr;
- struct clk *clk;
struct clk *bus_clk;
struct rcar_msi msi;
};
@@ -917,15 +916,6 @@ static int rcar_pcie_get_resources(struct rcar_pcie *pcie)
if (IS_ERR(pcie->base))
return PTR_ERR(pcie->base);
- pcie->clk = devm_clk_get(dev, "pcie");
- if (IS_ERR(pcie->clk)) {
- dev_err(dev, "cannot get platform clock\n");
- return PTR_ERR(pcie->clk);
- }
- err = clk_prepare_enable(pcie->clk);
- if (err)
- return err;
-
pcie->bus_clk = devm_clk_get(dev, "pcie_bus");
if (IS_ERR(pcie->bus_clk)) {
dev_err(dev, "cannot get pcie bus clock\n");
@@ -957,7 +947,6 @@ static int rcar_pcie_get_resources(struct rcar_pcie *pcie)
err_map_reg:
clk_disable_unprepare(pcie->bus_clk);
fail_clk:
- clk_disable_unprepare(pcie->clk);
return err;
}
@@ -1126,6 +1115,13 @@ static int rcar_pcie_probe(struct platform_device *pdev)
rcar_pcie_parse_request_of_pci_ranges(pcie);
+ pm_runtime_enable(pcie->dev);
+ err = pm_runtime_get_sync(pcie->dev);
+ if (err < 0) {
+ dev_err(pcie->dev, "pm_runtime_get_sync failed\n");
+ goto err_pm_disable;
+ }
+
err = rcar_pcie_get_resources(pcie);
if (err < 0) {
dev_err(dev, "failed to request resources: %d\n", err);
@@ -1136,13 +1132,6 @@ static int rcar_pcie_probe(struct platform_device *pdev)
if (err)
goto err_free_bridge;
- pm_runtime_enable(dev);
- err = pm_runtime_get_sync(dev);
- if (err < 0) {
- dev_err(dev, "pm_runtime_get_sync failed\n");
- goto err_pm_disable;
- }
-
/* Failure to get a link might just be that no cards are inserted */
hw_init_fn = of_device_get_match_data(dev);
err = hw_init_fn(pcie);
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] PCI: rcar: Use runtime PM to control controller clock
2017-11-08 9:19 [PATCH] PCI: rcar: Use runtime PM to control controller clock Marek Vasut
@ 2017-11-08 9:36 ` Geert Uytterhoeven
2017-11-08 9:55 ` Marek Vasut
0 siblings, 1 reply; 3+ messages in thread
From: Geert Uytterhoeven @ 2017-11-08 9:36 UTC (permalink / raw)
To: Marek Vasut
Cc: linux-pci, Dien Pham, Hien Dang, Marek Vasut, Geert Uytterhoeven,
Simon Horman, Wolfram Sang, Linux-Renesas
Hi Marek,
On Wed, Nov 8, 2017 at 10:19 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
> From: Dien Pham <dien.pham.ry@rvc.renesas.com>
>
> The controller clock can be switched off during suspend/resume,
> let runtime PM take care of that.
>
> Signed-off-by: Dien Pham <dien.pham.ry@rvc.renesas.com>
> Signed-off-by: Hien Dang <hien.dang.eb@renesas.com>
> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Thanks for your patch!
> --- a/drivers/pci/host/pcie-rcar.c
> +++ b/drivers/pci/host/pcie-rcar.c
> @@ -1126,6 +1115,13 @@ static int rcar_pcie_probe(struct platform_device *pdev)
>
> rcar_pcie_parse_request_of_pci_ranges(pcie);
>
> + pm_runtime_enable(pcie->dev);
> + err = pm_runtime_get_sync(pcie->dev);
> + if (err < 0) {
> + dev_err(pcie->dev, "pm_runtime_get_sync failed\n");
> + goto err_pm_disable;
> + }
> +
> err = rcar_pcie_get_resources(pcie);
> if (err < 0) {
> dev_err(dev, "failed to request resources: %d\n", err);
> @@ -1136,13 +1132,6 @@ static int rcar_pcie_probe(struct platform_device *pdev)
> if (err)
> goto err_free_bridge;
>
> - pm_runtime_enable(dev);
> - err = pm_runtime_get_sync(dev);
> - if (err < 0) {
> - dev_err(dev, "pm_runtime_get_sync failed\n");
> - goto err_pm_disable;
> - }
> -
> /* Failure to get a link might just be that no cards are inserted */
> hw_init_fn = of_device_get_match_data(dev);
> err = hw_init_fn(pcie);
As you changed initialization order, cleanup order for error handling below
should be updated, too.
Apart from that, this patch looks good to me.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] PCI: rcar: Use runtime PM to control controller clock
2017-11-08 9:36 ` Geert Uytterhoeven
@ 2017-11-08 9:55 ` Marek Vasut
0 siblings, 0 replies; 3+ messages in thread
From: Marek Vasut @ 2017-11-08 9:55 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: linux-pci, Dien Pham, Hien Dang, Marek Vasut, Geert Uytterhoeven,
Simon Horman, Wolfram Sang, Linux-Renesas
On 11/08/2017 10:36 AM, Geert Uytterhoeven wrote:
> Hi Marek,
>
> On Wed, Nov 8, 2017 at 10:19 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
>> From: Dien Pham <dien.pham.ry@rvc.renesas.com>
>>
>> The controller clock can be switched off during suspend/resume,
>> let runtime PM take care of that.
>>
>> Signed-off-by: Dien Pham <dien.pham.ry@rvc.renesas.com>
>> Signed-off-by: Hien Dang <hien.dang.eb@renesas.com>
>> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
>
> Thanks for your patch!
>
>> --- a/drivers/pci/host/pcie-rcar.c
>> +++ b/drivers/pci/host/pcie-rcar.c
>
>> @@ -1126,6 +1115,13 @@ static int rcar_pcie_probe(struct platform_device *pdev)
>>
>> rcar_pcie_parse_request_of_pci_ranges(pcie);
>>
>> + pm_runtime_enable(pcie->dev);
>> + err = pm_runtime_get_sync(pcie->dev);
>> + if (err < 0) {
>> + dev_err(pcie->dev, "pm_runtime_get_sync failed\n");
>> + goto err_pm_disable;
>> + }
>> +
>> err = rcar_pcie_get_resources(pcie);
>> if (err < 0) {
>> dev_err(dev, "failed to request resources: %d\n", err);
>> @@ -1136,13 +1132,6 @@ static int rcar_pcie_probe(struct platform_device *pdev)
>> if (err)
>> goto err_free_bridge;
>>
>> - pm_runtime_enable(dev);
>> - err = pm_runtime_get_sync(dev);
>> - if (err < 0) {
>> - dev_err(dev, "pm_runtime_get_sync failed\n");
>> - goto err_pm_disable;
>> - }
>> -
>> /* Failure to get a link might just be that no cards are inserted */
>> hw_init_fn = of_device_get_match_data(dev);
>> err = hw_init_fn(pcie);
>
> As you changed initialization order, cleanup order for error handling below
> should be updated, too.
>
> Apart from that, this patch looks good to me.
Ah, thanks for catching this.
--
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-11-08 9:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-08 9:19 [PATCH] PCI: rcar: Use runtime PM to control controller clock Marek Vasut
2017-11-08 9:36 ` Geert Uytterhoeven
2017-11-08 9:55 ` Marek Vasut
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).