dmaengine Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH] [v5] dmaengine: tegra210-adma: Fix runtime PM imbalance on error
@ 2020-06-24  6:46 Dinghao Liu
  2020-06-24  8:58 ` Jon Hunter
  2020-06-24  9:42 ` Vinod Koul
  0 siblings, 2 replies; 3+ messages in thread
From: Dinghao Liu @ 2020-06-24  6:46 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(). _noidle() is the simplest
      one and it is sufficient for fixing this bug.

v4: - Use pm_runtime_put_noidle() instead of pm_runtime_put_sync()
      in tegra_adma_probe(). _noidle() is the simplest one and it is
      sufficient for fixing this bug.

v5: - Refine commit message.
---
 drivers/dma/tegra210-adma.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/dma/tegra210-adma.c b/drivers/dma/tegra210-adma.c
index db58d7e4f9fe..c5fa2ef74abc 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;
 	}
@@ -869,8 +870,10 @@ static int tegra_adma_probe(struct platform_device *pdev)
 	pm_runtime_enable(&pdev->dev);
 
 	ret = pm_runtime_get_sync(&pdev->dev);
-	if (ret < 0)
+	if (ret < 0) {
+		pm_runtime_put_noidle(&pdev->dev);
 		goto rpm_disable;
+	}
 
 	ret = tegra_adma_init(tdma);
 	if (ret)
-- 
2.17.1


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

* Re: [PATCH] [v5] dmaengine: tegra210-adma: Fix runtime PM imbalance on error
  2020-06-24  6:46 [PATCH] [v5] dmaengine: tegra210-adma: Fix runtime PM imbalance on error Dinghao Liu
@ 2020-06-24  8:58 ` Jon Hunter
  2020-06-24  9:42 ` Vinod Koul
  1 sibling, 0 replies; 3+ messages in thread
From: Jon Hunter @ 2020-06-24  8:58 UTC (permalink / raw)
  To: Dinghao Liu, kjlu
  Cc: Laxman Dewangan, Dan Williams, Vinod Koul, Thierry Reding,
	dmaengine, linux-tegra, linux-kernel


On 24/06/2020 07:46, 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.

I was hoping you would mention explicitly why we are using _noidle in
the changelog. However, let's not beat the dead horse any more and just
merge this. So ...

Reviewed-by: Jon Hunter <jonathanh@nvidia.com>

Thanks
Jon

> 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(). _noidle() is the simplest
>       one and it is sufficient for fixing this bug.
> 
> v4: - Use pm_runtime_put_noidle() instead of pm_runtime_put_sync()
>       in tegra_adma_probe(). _noidle() is the simplest one and it is
>       sufficient for fixing this bug.
> 
> v5: - Refine commit message.
> ---
>  drivers/dma/tegra210-adma.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/dma/tegra210-adma.c b/drivers/dma/tegra210-adma.c
> index db58d7e4f9fe..c5fa2ef74abc 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;
>  	}
> @@ -869,8 +870,10 @@ static int tegra_adma_probe(struct platform_device *pdev)
>  	pm_runtime_enable(&pdev->dev);
>  
>  	ret = pm_runtime_get_sync(&pdev->dev);
> -	if (ret < 0)
> +	if (ret < 0) {
> +		pm_runtime_put_noidle(&pdev->dev);
>  		goto rpm_disable;
> +	}
>  
>  	ret = tegra_adma_init(tdma);
>  	if (ret)
> 

-- 
nvpublic

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

* Re: [PATCH] [v5] dmaengine: tegra210-adma: Fix runtime PM imbalance on error
  2020-06-24  6:46 [PATCH] [v5] dmaengine: tegra210-adma: Fix runtime PM imbalance on error Dinghao Liu
  2020-06-24  8:58 ` Jon Hunter
@ 2020-06-24  9:42 ` Vinod Koul
  1 sibling, 0 replies; 3+ messages in thread
From: Vinod Koul @ 2020-06-24  9:42 UTC (permalink / raw)
  To: Dinghao Liu
  Cc: kjlu, Laxman Dewangan, Jon Hunter, Dan Williams, Thierry Reding,
	dmaengine, linux-tegra, linux-kernel

On 24-06-20, 14:46, 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.

Applied, thanks

-- 
~Vinod

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

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-24  6:46 [PATCH] [v5] dmaengine: tegra210-adma: Fix runtime PM imbalance on error Dinghao Liu
2020-06-24  8:58 ` Jon Hunter
2020-06-24  9:42 ` Vinod Koul

dmaengine Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/dmaengine/0 dmaengine/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dmaengine dmaengine/ https://lore.kernel.org/dmaengine \
		dmaengine@vger.kernel.org
	public-inbox-index dmaengine

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.dmaengine


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git