2021-04-09 08:29:55

by Dinghao Liu

[permalink] [raw]
Subject: [PATCH] [v2] dmaengine: tegra20: Fix runtime PM imbalance on error

pm_runtime_get_sync() will increase the runtime PM counter
even it returns an error. Thus a pairing decrement is needed
to prevent refcount leak. Fix this by replacing this API with
pm_runtime_resume_and_get(), which will not change the runtime
PM counter on error.

Signed-off-by: Dinghao Liu <[email protected]>
---

Changelog:

v2: - Fix another similar case in tegra_dma_synchronize().
---
drivers/dma/tegra20-apb-dma.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c
index 71827d9b0aa1..b7260749e8ee 100644
--- a/drivers/dma/tegra20-apb-dma.c
+++ b/drivers/dma/tegra20-apb-dma.c
@@ -723,7 +723,7 @@ static void tegra_dma_issue_pending(struct dma_chan *dc)
goto end;
}
if (!tdc->busy) {
- err = pm_runtime_get_sync(tdc->tdma->dev);
+ err = pm_runtime_resume_and_get(tdc->tdma->dev);
if (err < 0) {
dev_err(tdc2dev(tdc), "Failed to enable DMA\n");
goto end;
@@ -818,7 +818,7 @@ static void tegra_dma_synchronize(struct dma_chan *dc)
struct tegra_dma_channel *tdc = to_tegra_dma_chan(dc);
int err;

- err = pm_runtime_get_sync(tdc->tdma->dev);
+ err = pm_runtime_resume_and_get(tdc->tdma->dev);
if (err < 0) {
dev_err(tdc2dev(tdc), "Failed to synchronize DMA: %d\n", err);
return;
--
2.17.1


2021-04-09 11:35:02

by Thierry Reding

[permalink] [raw]
Subject: Re: [PATCH] [v2] dmaengine: tegra20: Fix runtime PM imbalance on error

On Fri, Apr 09, 2021 at 04:28:05PM +0800, Dinghao Liu wrote:
> pm_runtime_get_sync() will increase the runtime PM counter
> even it returns an error. Thus a pairing decrement is needed
> to prevent refcount leak. Fix this by replacing this API with
> pm_runtime_resume_and_get(), which will not change the runtime
> PM counter on error.
>
> Signed-off-by: Dinghao Liu <[email protected]>
> ---
>
> Changelog:
>
> v2: - Fix another similar case in tegra_dma_synchronize().
> ---
> drivers/dma/tegra20-apb-dma.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

Looks good:

Acked-by: Thierry Reding <[email protected]>

Attachments:
(No filename) (659.00 B)
 signature.asc (849.00 B)
 Download all attachments

2021-04-12 09:58:19

by Vinod Koul

[permalink] [raw]
Subject: Re: [PATCH] [v2] dmaengine: tegra20: Fix runtime PM imbalance on error

On 09-04-21, 16:28, Dinghao Liu wrote:
> pm_runtime_get_sync() will increase the runtime PM counter
> even it returns an error. Thus a pairing decrement is needed
> to prevent refcount leak. Fix this by replacing this API with
> pm_runtime_resume_and_get(), which will not change the runtime
> PM counter on error.

Applied, thanks

--
~Vinod