summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2010-02-11 16:50:18 +0000
committerPaul Mundt <lethal@linux-sh.org>2010-03-02 11:09:07 +0900
commit20f2a3b5d57701c54bdd59b89dd37fe775926bae (patch)
tree28a69ee7db15840fa886c51524c52a1a787487e4 /drivers/dma
parent8b1935e6a36b0967efc593d67ed3aebbfbc1f5b1 (diff)
downloadop-kernel-dev-20f2a3b5d57701c54bdd59b89dd37fe775926bae.zip
op-kernel-dev-20f2a3b5d57701c54bdd59b89dd37fe775926bae.tar.gz
dmaengine: shdma: add runtime PM support.
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>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/shdma.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c
index b419afaa..ea6779f 100644
--- a/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
@@ -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 */
@@ -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.
@@ -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;
}
@@ -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);
@@ -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);
}
@@ -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)
@@ -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);
@@ -1079,6 +1096,7 @@ eirqres:
eirq_err:
#endif
rst_err:
+ pm_runtime_put(&pdev->dev);
if (dmars)
iounmap(shdev->dmars);
emapdmars:
@@ -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);
OpenPOWER on IntegriCloud