Skip to content

Commit

Permalink
dmaengine: shdma: add runtime PM support.
Browse files Browse the repository at this point in the history
Provided platforms implement runtime PM, this disables the controller, when not
in use.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Guennadi Liakhovetski authored and Paul Mundt committed Mar 2, 2010
1 parent 8b1935e commit 20f2a3b
Showing 1 changed file with 20 additions and 0 deletions.
20 changes: 20 additions & 0 deletions drivers/dma/shdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@
#include <linux/delay.h>
#include <linux/dma-mapping.h>
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>

#include <asm/dmaengine.h>

#include "shdma.h"

/* DMA descriptor control */
Expand Down Expand Up @@ -287,6 +290,8 @@ static int sh_dmae_alloc_chan_resources(struct dma_chan *chan)
struct sh_desc *desc;
struct sh_dmae_slave *param = chan->private;

pm_runtime_get_sync(sh_chan->dev);

/*
* This relies on the guarantee from dmaengine that alloc_chan_resources
* never runs concurrently with itself or free_chan_resources.
Expand Down Expand Up @@ -328,6 +333,9 @@ static int sh_dmae_alloc_chan_resources(struct dma_chan *chan)
}
spin_unlock_bh(&sh_chan->desc_lock);

if (!sh_chan->descs_allocated)
pm_runtime_put(sh_chan->dev);

return sh_chan->descs_allocated;
}

Expand All @@ -339,6 +347,7 @@ static void sh_dmae_free_chan_resources(struct dma_chan *chan)
struct sh_dmae_chan *sh_chan = to_sh_chan(chan);
struct sh_desc *desc, *_desc;
LIST_HEAD(list);
int descs = sh_chan->descs_allocated;

dmae_halt(sh_chan);

Expand All @@ -359,6 +368,9 @@ static void sh_dmae_free_chan_resources(struct dma_chan *chan)

spin_unlock_bh(&sh_chan->desc_lock);

if (descs > 0)
pm_runtime_put(sh_chan->dev);

list_for_each_entry_safe(desc, _desc, &list, node)
kfree(desc);
}
Expand Down Expand Up @@ -978,6 +990,9 @@ static int __init sh_dmae_probe(struct platform_device *pdev)
/* platform data */
shdev->pdata = pdata;

pm_runtime_enable(&pdev->dev);
pm_runtime_get_sync(&pdev->dev);

/* reset dma controller */
err = sh_dmae_rst(shdev);
if (err)
Expand Down Expand Up @@ -1066,6 +1081,8 @@ static int __init sh_dmae_probe(struct platform_device *pdev)
goto chan_probe_err;
}

pm_runtime_put(&pdev->dev);

platform_set_drvdata(pdev, shdev);
dma_async_device_register(&shdev->common);

Expand All @@ -1079,6 +1096,7 @@ static int __init sh_dmae_probe(struct platform_device *pdev)
eirq_err:
#endif
rst_err:
pm_runtime_put(&pdev->dev);
if (dmars)
iounmap(shdev->dmars);
emapdmars:
Expand Down Expand Up @@ -1108,6 +1126,8 @@ static int __exit sh_dmae_remove(struct platform_device *pdev)
/* channel data remove */
sh_dmae_chan_remove(shdev);

pm_runtime_disable(&pdev->dev);

if (shdev->dmars)
iounmap(shdev->dmars);
iounmap(shdev->chan_reg);
Expand Down

0 comments on commit 20f2a3b

Please sign in to comment.