* [PATCH] [v3] dmaengine: tegra210-adma: Fix runtime PM imbalance on error
@ 2020-06-18 10:57 Dinghao Liu
2020-06-18 19:32 ` Jon Hunter
0 siblings, 1 reply; 5+ messages in thread
From: Dinghao Liu @ 2020-06-18 10:57 UTC (permalink / raw)
To: dinghao.liu, kjlu
Cc: Laxman Dewangan, Jon Hunter, Dan Williams, Vinod Koul,
Thierry Reding, dmaengine, linux-tegra, 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.
Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
---
Changelog:
v2: - Merge two patches that fix runtime PM imbalance in
tegra_adma_probe() and tegra_adma_alloc_chan_resources()
respectively.
v3: - Use pm_runtime_put_noidle() instead of pm_runtime_put_sync()
in tegra_adma_alloc_chan_resources().
---
drivers/dma/tegra210-adma.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/dma/tegra210-adma.c b/drivers/dma/tegra210-adma.c
index db58d7e4f9fe..bfa8800dfb4c 100644
--- a/drivers/dma/tegra210-adma.c
+++ b/drivers/dma/tegra210-adma.c
@@ -658,6 +658,7 @@ static int tegra_adma_alloc_chan_resources(struct dma_chan *dc)
ret = pm_runtime_get_sync(tdc2dev(tdc));
if (ret < 0) {
+ pm_runtime_put_noidle(tdc2dev(tdc));
free_irq(tdc->irq, tdc);
return ret;
}
@@ -870,7 +871,7 @@ static int tegra_adma_probe(struct platform_device *pdev)
ret = pm_runtime_get_sync(&pdev->dev);
if (ret < 0)
- goto rpm_disable;
+ goto rpm_put;
ret = tegra_adma_init(tdma);
if (ret)
@@ -921,7 +922,6 @@ static int tegra_adma_probe(struct platform_device *pdev)
dma_async_device_unregister(&tdma->dma_dev);
rpm_put:
pm_runtime_put_sync(&pdev->dev);
-rpm_disable:
pm_runtime_disable(&pdev->dev);
irq_dispose:
while (--i >= 0)
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] [v3] dmaengine: tegra210-adma: Fix runtime PM imbalance on error
2020-06-18 10:57 [PATCH] [v3] dmaengine: tegra210-adma: Fix runtime PM imbalance on error Dinghao Liu
@ 2020-06-18 19:32 ` Jon Hunter
2020-06-19 1:59 ` dinghao.liu
0 siblings, 1 reply; 5+ messages in thread
From: Jon Hunter @ 2020-06-18 19:32 UTC (permalink / raw)
To: Dinghao Liu, kjlu
Cc: Laxman Dewangan, Dan Williams, Vinod Koul, Thierry Reding,
dmaengine, linux-tegra, linux-kernel
On 18/06/2020 11:57, 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.
>
> Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
> ---
>
> Changelog:
>
> v2: - Merge two patches that fix runtime PM imbalance in
> tegra_adma_probe() and tegra_adma_alloc_chan_resources()
> respectively.
>
> v3: - Use pm_runtime_put_noidle() instead of pm_runtime_put_sync()
> in tegra_adma_alloc_chan_resources().
> ---
> drivers/dma/tegra210-adma.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/dma/tegra210-adma.c b/drivers/dma/tegra210-adma.c
> index db58d7e4f9fe..bfa8800dfb4c 100644
> --- a/drivers/dma/tegra210-adma.c
> +++ b/drivers/dma/tegra210-adma.c
> @@ -658,6 +658,7 @@ static int tegra_adma_alloc_chan_resources(struct dma_chan *dc)
>
> ret = pm_runtime_get_sync(tdc2dev(tdc));
> if (ret < 0) {
> + pm_runtime_put_noidle(tdc2dev(tdc));
Why noidle?
Jon
--
nvpublic
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Re: [PATCH] [v3] dmaengine: tegra210-adma: Fix runtime PM imbalance on error
2020-06-18 19:32 ` Jon Hunter
@ 2020-06-19 1:59 ` dinghao.liu
2020-06-20 9:53 ` Jon Hunter
0 siblings, 1 reply; 5+ messages in thread
From: dinghao.liu @ 2020-06-19 1:59 UTC (permalink / raw)
To: Jon Hunter
Cc: kjlu, Laxman Dewangan, Dan Williams, Vinod Koul, Thierry Reding,
dmaengine, linux-tegra, linux-kernel
>
> Why noidle?
>
_noidle is enough for fixing this bug. _sync may suspend
the device beyond expectation.
Regards,
Dinghao
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] [v3] dmaengine: tegra210-adma: Fix runtime PM imbalance on error
2020-06-19 1:59 ` dinghao.liu
@ 2020-06-20 9:53 ` Jon Hunter
2020-06-21 5:27 ` dinghao.liu
0 siblings, 1 reply; 5+ messages in thread
From: Jon Hunter @ 2020-06-20 9:53 UTC (permalink / raw)
To: dinghao.liu
Cc: kjlu, Laxman Dewangan, Dan Williams, Vinod Koul, Thierry Reding,
dmaengine, linux-tegra, linux-kernel
On 19/06/2020 02:59, dinghao.liu@zju.edu.cn wrote:
>>
>> Why noidle?
>>
>
> _noidle is enough for fixing this bug. _sync may suspend
> the device beyond expectation.
In that case, then the other instance you are fixing with this patch is
not correct.
Jon
--
nvpublic
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Re: [PATCH] [v3] dmaengine: tegra210-adma: Fix runtime PM imbalance on error
2020-06-20 9:53 ` Jon Hunter
@ 2020-06-21 5:27 ` dinghao.liu
0 siblings, 0 replies; 5+ messages in thread
From: dinghao.liu @ 2020-06-21 5:27 UTC (permalink / raw)
To: Jon Hunter
Cc: kjlu, Laxman Dewangan, Dan Williams, Vinod Koul, Thierry Reding,
dmaengine, linux-tegra, linux-kernel
> >>
> >> Why noidle?
> >>
> >
> > _noidle is enough for fixing this bug. _sync may suspend
> > the device beyond expectation.
>
> In that case, then the other instance you are fixing with this patch is
> not correct.
>
Fine. I will fix this soon.
Regards,
Dinghao
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-06-21 5:27 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-18 10:57 [PATCH] [v3] dmaengine: tegra210-adma: Fix runtime PM imbalance on error Dinghao Liu
2020-06-18 19:32 ` Jon Hunter
2020-06-19 1:59 ` dinghao.liu
2020-06-20 9:53 ` Jon Hunter
2020-06-21 5:27 ` dinghao.liu
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).