* [PATCH] [v2] PCI: tegra: Fix runtime PM imbalance on error
@ 2020-05-21 2:47 Dinghao Liu
2020-05-29 18:05 ` Thierry Reding
0 siblings, 1 reply; 3+ messages in thread
From: Dinghao Liu @ 2020-05-21 2:47 UTC (permalink / raw)
To: dinghao.liu, kjlu
Cc: Thierry Reding, Lorenzo Pieralisi, Rob Herring, Bjorn Helgaas,
Jonathan Hunter, linux-tegra, linux-pci, linux-kernel
pm_runtime_get_sync() increments the runtime PM usage counter even
when it returns an error code. Thus a pairing decrement is needed on
the error handling path to keep the counter balanced.
Also, call pm_runtime_disable() when pm_runtime_get_sync() returns
an error code.
Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
---
drivers/pci/controller/pci-tegra.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/pci/controller/pci-tegra.c b/drivers/pci/controller/pci-tegra.c
index 3e64ba6a36a8..00236dd65b5b 100644
--- a/drivers/pci/controller/pci-tegra.c
+++ b/drivers/pci/controller/pci-tegra.c
@@ -2712,7 +2712,7 @@ static int tegra_pcie_probe(struct platform_device *pdev)
err = pm_runtime_get_sync(pcie->dev);
if (err < 0) {
dev_err(dev, "fail to enable pcie controller: %d\n", err);
- goto teardown_msi;
+ goto pm_runtime_put;
}
host->busnr = bus->start;
@@ -2746,7 +2746,6 @@ static int tegra_pcie_probe(struct platform_device *pdev)
pm_runtime_put:
pm_runtime_put_sync(pcie->dev);
pm_runtime_disable(pcie->dev);
-teardown_msi:
tegra_pcie_msi_teardown(pcie);
put_resources:
tegra_pcie_put_resources(pcie);
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] [v2] PCI: tegra: Fix runtime PM imbalance on error
2020-05-21 2:47 [PATCH] [v2] PCI: tegra: Fix runtime PM imbalance on error Dinghao Liu
@ 2020-05-29 18:05 ` Thierry Reding
2020-06-01 9:05 ` Lorenzo Pieralisi
0 siblings, 1 reply; 3+ messages in thread
From: Thierry Reding @ 2020-05-29 18:05 UTC (permalink / raw)
To: Dinghao Liu
Cc: kjlu, Lorenzo Pieralisi, Rob Herring, Bjorn Helgaas,
Jonathan Hunter, linux-tegra, linux-pci, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 566 bytes --]
On Thu, May 21, 2020 at 10:47:09AM +0800, Dinghao Liu wrote:
> pm_runtime_get_sync() increments the runtime PM usage counter even
> when it returns an error code. Thus a pairing decrement is needed on
> the error handling path to keep the counter balanced.
>
> Also, call pm_runtime_disable() when pm_runtime_get_sync() returns
> an error code.
>
> Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
> ---
> drivers/pci/controller/pci-tegra.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
Acked-by: Thierry Reding <treding@nvidia.com>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] [v2] PCI: tegra: Fix runtime PM imbalance on error
2020-05-29 18:05 ` Thierry Reding
@ 2020-06-01 9:05 ` Lorenzo Pieralisi
0 siblings, 0 replies; 3+ messages in thread
From: Lorenzo Pieralisi @ 2020-06-01 9:05 UTC (permalink / raw)
To: Thierry Reding
Cc: Dinghao Liu, kjlu, Rob Herring, Bjorn Helgaas, Jonathan Hunter,
linux-tegra, linux-pci, linux-kernel
On Fri, May 29, 2020 at 08:05:18PM +0200, Thierry Reding wrote:
> On Thu, May 21, 2020 at 10:47:09AM +0800, Dinghao Liu wrote:
> > pm_runtime_get_sync() increments the runtime PM usage counter even
> > when it returns an error code. Thus a pairing decrement is needed on
> > the error handling path to keep the counter balanced.
> >
> > Also, call pm_runtime_disable() when pm_runtime_get_sync() returns
> > an error code.
> >
> > Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
> > ---
> > drivers/pci/controller/pci-tegra.c | 3 +--
> > 1 file changed, 1 insertion(+), 2 deletions(-)
>
> Acked-by: Thierry Reding <treding@nvidia.com>
Applied to pci/tegra, thanks !
Lorenzo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-06-01 9:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-21 2:47 [PATCH] [v2] PCI: tegra: Fix runtime PM imbalance on error Dinghao Liu
2020-05-29 18:05 ` Thierry Reding
2020-06-01 9:05 ` Lorenzo Pieralisi
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).