dmaengine.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] dmaengine: tegra210-adma: Fix runtime PM imbalance on error
@ 2020-05-22  7:58 Dinghao Liu
  2020-05-22 10:43 ` Jon Hunter
  0 siblings, 1 reply; 6+ messages in thread
From: Dinghao Liu @ 2020-05-22  7:58 UTC (permalink / raw)
  To: dinghao.liu, kjlu
  Cc: Laxman Dewangan, Jon Hunter, Vinod Koul, Dan Williams,
	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>
---
 drivers/dma/tegra210-adma.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/dma/tegra210-adma.c b/drivers/dma/tegra210-adma.c
index c4ce5dfb149b..803e1f4d5dac 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_sync(tdc2dev(tdc));
 		free_irq(tdc->irq, tdc);
 		return ret;
 	}
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] dmaengine: tegra210-adma: Fix runtime PM imbalance on error
  2020-05-22  7:58 [PATCH] dmaengine: tegra210-adma: Fix runtime PM imbalance on error Dinghao Liu
@ 2020-05-22 10:43 ` Jon Hunter
  2020-05-22 10:57   ` dinghao.liu
  0 siblings, 1 reply; 6+ messages in thread
From: Jon Hunter @ 2020-05-22 10:43 UTC (permalink / raw)
  To: Dinghao Liu, kjlu
  Cc: Laxman Dewangan, Vinod Koul, Dan Williams, Thierry Reding,
	dmaengine, linux-tegra, linux-kernel


On 22/05/2020 08:58, 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>
> ---
>  drivers/dma/tegra210-adma.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/dma/tegra210-adma.c b/drivers/dma/tegra210-adma.c
> index c4ce5dfb149b..803e1f4d5dac 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_sync(tdc2dev(tdc));
>  		free_irq(tdc->irq, tdc);
>  		return ret;
>  	}
> 


There is another place in probe that needs to be fixed as well. Can you
correct this while you are at it?

Thanks
Jon

-- 
nvpublic

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Re: [PATCH] dmaengine: tegra210-adma: Fix runtime PM imbalance on error
  2020-05-22 10:43 ` Jon Hunter
@ 2020-05-22 10:57   ` dinghao.liu
  2020-05-22 11:27     ` Jon Hunter
  0 siblings, 1 reply; 6+ messages in thread
From: dinghao.liu @ 2020-05-22 10:57 UTC (permalink / raw)
  To: Jon Hunter
  Cc: kjlu, Laxman Dewangan, Vinod Koul, Dan Williams, Thierry Reding,
	dmaengine, linux-tegra, linux-kernel

> 
> On 22/05/2020 08:58, 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>
> > ---
> >  drivers/dma/tegra210-adma.c | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/drivers/dma/tegra210-adma.c b/drivers/dma/tegra210-adma.c
> > index c4ce5dfb149b..803e1f4d5dac 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_sync(tdc2dev(tdc));
> >  		free_irq(tdc->irq, tdc);
> >  		return ret;
> >  	}
> > 
> 
> 
> There is another place in probe that needs to be fixed as well. Can you
> correct this while you are at it?
> 
> Thanks
> Jon
> 
> -- 
> nvpublic

Sure. I have sent a patch to fix PM imbalance in tegra_adma_probe().

Regards,
Dinghao

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] dmaengine: tegra210-adma: Fix runtime PM imbalance on error
  2020-05-22 10:57   ` dinghao.liu
@ 2020-05-22 11:27     ` Jon Hunter
  2020-05-22 11:32       ` dinghao.liu
  0 siblings, 1 reply; 6+ messages in thread
From: Jon Hunter @ 2020-05-22 11:27 UTC (permalink / raw)
  To: dinghao.liu
  Cc: kjlu, Laxman Dewangan, Vinod Koul, Dan Williams, Thierry Reding,
	dmaengine, linux-tegra, linux-kernel


On 22/05/2020 11:57, dinghao.liu@zju.edu.cn wrote:
>>
>> On 22/05/2020 08:58, 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>
>>> ---
>>>  drivers/dma/tegra210-adma.c | 1 +
>>>  1 file changed, 1 insertion(+)
>>>
>>> diff --git a/drivers/dma/tegra210-adma.c b/drivers/dma/tegra210-adma.c
>>> index c4ce5dfb149b..803e1f4d5dac 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_sync(tdc2dev(tdc));
>>>  		free_irq(tdc->irq, tdc);
>>>  		return ret;
>>>  	}
>>>
>>
>>
>> There is another place in probe that needs to be fixed as well. Can you
>> correct this while you are at it?
>>
>> Thanks
>> Jon
>>
>> -- 
>> nvpublic
> 
> Sure. I have sent a patch to fix PM imbalance in tegra_adma_probe().


You should only send one patch to fix both instances as it is the same
driver. It is impossible to figure out that two patches with the same
$subject are different.

Jon

-- 
nvpublic

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Re: [PATCH] dmaengine: tegra210-adma: Fix runtime PM imbalance on error
  2020-05-22 11:27     ` Jon Hunter
@ 2020-05-22 11:32       ` dinghao.liu
  0 siblings, 0 replies; 6+ messages in thread
From: dinghao.liu @ 2020-05-22 11:32 UTC (permalink / raw)
  To: Jon Hunter
  Cc: kjlu, Laxman Dewangan, Vinod Koul, Dan Williams, Thierry Reding,
	dmaengine, linux-tegra, linux-kernel

> 
> On 22/05/2020 11:57, dinghao.liu@zju.edu.cn wrote:
> >>
> >> On 22/05/2020 08:58, 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>
> >>> ---
> >>>  drivers/dma/tegra210-adma.c | 1 +
> >>>  1 file changed, 1 insertion(+)
> >>>
> >>> diff --git a/drivers/dma/tegra210-adma.c b/drivers/dma/tegra210-adma.c
> >>> index c4ce5dfb149b..803e1f4d5dac 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_sync(tdc2dev(tdc));
> >>>  		free_irq(tdc->irq, tdc);
> >>>  		return ret;
> >>>  	}
> >>>
> >>
> >>
> >> There is another place in probe that needs to be fixed as well. Can you
> >> correct this while you are at it?
> >>
> >> Thanks
> >> Jon
> >>
> >> -- 
> >> nvpublic
> > 
> > Sure. I have sent a patch to fix PM imbalance in tegra_adma_probe().
> 
> 
> You should only send one patch to fix both instances as it is the same
> driver. It is impossible to figure out that two patches with the same
> $subject are different.
> 
> Jon
> 
> -- 
> nvpublic

OK. I will fix this in the next version of patch.

Regards,
Dinghao

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH] dmaengine: tegra210-adma: Fix runtime PM imbalance on error
@ 2020-05-21  8:05 Dinghao Liu
  0 siblings, 0 replies; 6+ messages in thread
From: Dinghao Liu @ 2020-05-21  8:05 UTC (permalink / raw)
  To: dinghao.liu, kjlu
  Cc: Laxman Dewangan, Jon Hunter, Vinod Koul, Dan Williams,
	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>
---
 drivers/dma/tegra210-adma.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/dma/tegra210-adma.c b/drivers/dma/tegra210-adma.c
index c4ce5dfb149b..8f5e4949d720 100644
--- a/drivers/dma/tegra210-adma.c
+++ b/drivers/dma/tegra210-adma.c
@@ -870,7 +870,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 +921,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] 6+ messages in thread

end of thread, other threads:[~2020-05-22 11:32 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-22  7:58 [PATCH] dmaengine: tegra210-adma: Fix runtime PM imbalance on error Dinghao Liu
2020-05-22 10:43 ` Jon Hunter
2020-05-22 10:57   ` dinghao.liu
2020-05-22 11:27     ` Jon Hunter
2020-05-22 11:32       ` dinghao.liu
  -- strict thread matches above, loose matches on Subject: below --
2020-05-21  8:05 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).