Skip to content

Commit

Permalink
dmaengine: at_xdmac: disable/enable clock directly on suspend/resume
Browse files Browse the repository at this point in the history
[ Upstream commit 2de5ddb ]

Runtime PM APIs for at_xdmac just plays with clk_enable()/clk_disable()
letting aside the clk_prepare()/clk_unprepare() that needs to be
executed as the clock is also prepared on probe. Thus instead of using
runtime PM force suspend/resume APIs use
clk_disable_unprepare() + pm_runtime_put_noidle() on suspend and
clk_prepare_enable() + pm_runtime_get_noresume() on resume. This
approach as been chosen instead of using runtime PM force suspend/resume
with clk_unprepare()/clk_prepare() as it looks simpler and the final
code is better.

While at it added the missing pm_runtime_mark_last_busy() on suspend before
decrementing the reference counter.

Fixes: 650b0e9 ("dmaengine: at_xdmac: add runtime pm support")
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Link: https://lore.kernel.org/r/20230214151827.1050280-2-claudiu.beznea@microchip.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
claudiubeznea authored and gregkh committed May 11, 2023
1 parent 37c0f44 commit cd6b888
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions drivers/dma/at_xdmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -2130,7 +2130,11 @@ static int __maybe_unused atmel_xdmac_suspend(struct device *dev)
atxdmac->save_gim = at_xdmac_read(atxdmac, AT_XDMAC_GIM);

at_xdmac_off(atxdmac);
return pm_runtime_force_suspend(atxdmac->dev);
pm_runtime_mark_last_busy(atxdmac->dev);
pm_runtime_put_noidle(atxdmac->dev);
clk_disable_unprepare(atxdmac->clk);

return 0;
}

static int __maybe_unused atmel_xdmac_resume(struct device *dev)
Expand All @@ -2142,10 +2146,12 @@ static int __maybe_unused atmel_xdmac_resume(struct device *dev)
int i;
int ret;

ret = pm_runtime_force_resume(atxdmac->dev);
if (ret < 0)
ret = clk_prepare_enable(atxdmac->clk);
if (ret)
return ret;

pm_runtime_get_noresume(atxdmac->dev);

at_xdmac_axi_config(pdev);

/* Clear pending interrupts. */
Expand Down

0 comments on commit cd6b888

Please sign in to comment.