* [PATCH 1/2] dma: mmp_tdma: add DMA_PREP_INTERRUPT flag support
@ 2014-09-10 8:40 ` Qiao Zhou
0 siblings, 0 replies; 10+ messages in thread
From: Qiao Zhou @ 2014-09-10 8:40 UTC (permalink / raw)
To: dan.j.williams, vinod.koul, dmaengine, zhangfei.gao, eric.y.miao,
haojian.zhuang, linux, lgirdwood, broonie, perex, tiwai,
alsa-devel, linux-arm-kernel
Cc: Qiao Zhou
add DMA_PREP_INTERRUPT flag to support no_period_wakeup, in which
user space app doesn't want audio interrupt to wake up audio threads.
Signed-off-by: Qiao Zhou <zhouqiao@marvell.com>
---
drivers/dma/mmp_tdma.c | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/drivers/dma/mmp_tdma.c b/drivers/dma/mmp_tdma.c
index 6ad30e2..c6bd015 100644
--- a/drivers/dma/mmp_tdma.c
+++ b/drivers/dma/mmp_tdma.c
@@ -148,10 +148,16 @@ static void mmp_tdma_chan_set_desc(struct mmp_tdma_chan *tdmac, dma_addr_t phys)
tdmac->reg_base + TDCR);
}
+static void mmp_tdma_enable_irq(struct mmp_tdma_chan *tdmac, bool enable)
+{
+ if (enable)
+ writel(TDIMR_COMP, tdmac->reg_base + TDIMR);
+ else
+ writel(0, tdmac->reg_base + TDIMR);
+}
+
static void mmp_tdma_enable_chan(struct mmp_tdma_chan *tdmac)
{
- /* enable irq */
- writel(TDIMR_COMP, tdmac->reg_base + TDIMR);
/* enable dma chan */
writel(readl(tdmac->reg_base + TDCR) | TDCR_CHANEN,
tdmac->reg_base + TDCR);
@@ -163,9 +169,6 @@ static void mmp_tdma_disable_chan(struct mmp_tdma_chan *tdmac)
writel(readl(tdmac->reg_base + TDCR) & ~TDCR_CHANEN,
tdmac->reg_base + TDCR);
- /* disable irq */
- writel(0, tdmac->reg_base + TDIMR);
-
tdmac->status = DMA_COMPLETE;
}
@@ -434,6 +437,10 @@ static struct dma_async_tx_descriptor *mmp_tdma_prep_dma_cyclic(
i++;
}
+ /* enable interrupt */
+ if (flags & DMA_PREP_INTERRUPT)
+ mmp_tdma_enable_irq(tdmac, true);
+
tdmac->buf_len = buf_len;
tdmac->period_len = period_len;
tdmac->pos = 0;
@@ -455,6 +462,8 @@ static int mmp_tdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
switch (cmd) {
case DMA_TERMINATE_ALL:
mmp_tdma_disable_chan(tdmac);
+ /* disable interrupt */
+ mmp_tdma_enable_irq(tdmac, false);
break;
case DMA_PAUSE:
mmp_tdma_pause_chan(tdmac);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 1/2] dma: mmp_tdma: add DMA_PREP_INTERRUPT flag support
@ 2014-09-10 8:40 ` Qiao Zhou
0 siblings, 0 replies; 10+ messages in thread
From: Qiao Zhou @ 2014-09-10 8:40 UTC (permalink / raw)
To: linux-arm-kernel
add DMA_PREP_INTERRUPT flag to support no_period_wakeup, in which
user space app doesn't want audio interrupt to wake up audio threads.
Signed-off-by: Qiao Zhou <zhouqiao@marvell.com>
---
drivers/dma/mmp_tdma.c | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/drivers/dma/mmp_tdma.c b/drivers/dma/mmp_tdma.c
index 6ad30e2..c6bd015 100644
--- a/drivers/dma/mmp_tdma.c
+++ b/drivers/dma/mmp_tdma.c
@@ -148,10 +148,16 @@ static void mmp_tdma_chan_set_desc(struct mmp_tdma_chan *tdmac, dma_addr_t phys)
tdmac->reg_base + TDCR);
}
+static void mmp_tdma_enable_irq(struct mmp_tdma_chan *tdmac, bool enable)
+{
+ if (enable)
+ writel(TDIMR_COMP, tdmac->reg_base + TDIMR);
+ else
+ writel(0, tdmac->reg_base + TDIMR);
+}
+
static void mmp_tdma_enable_chan(struct mmp_tdma_chan *tdmac)
{
- /* enable irq */
- writel(TDIMR_COMP, tdmac->reg_base + TDIMR);
/* enable dma chan */
writel(readl(tdmac->reg_base + TDCR) | TDCR_CHANEN,
tdmac->reg_base + TDCR);
@@ -163,9 +169,6 @@ static void mmp_tdma_disable_chan(struct mmp_tdma_chan *tdmac)
writel(readl(tdmac->reg_base + TDCR) & ~TDCR_CHANEN,
tdmac->reg_base + TDCR);
- /* disable irq */
- writel(0, tdmac->reg_base + TDIMR);
-
tdmac->status = DMA_COMPLETE;
}
@@ -434,6 +437,10 @@ static struct dma_async_tx_descriptor *mmp_tdma_prep_dma_cyclic(
i++;
}
+ /* enable interrupt */
+ if (flags & DMA_PREP_INTERRUPT)
+ mmp_tdma_enable_irq(tdmac, true);
+
tdmac->buf_len = buf_len;
tdmac->period_len = period_len;
tdmac->pos = 0;
@@ -455,6 +462,8 @@ static int mmp_tdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
switch (cmd) {
case DMA_TERMINATE_ALL:
mmp_tdma_disable_chan(tdmac);
+ /* disable interrupt */
+ mmp_tdma_enable_irq(tdmac, false);
break;
case DMA_PAUSE:
mmp_tdma_pause_chan(tdmac);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 2/2] ASoC: mmp-pcm: add NO_PERIOD_WAKEUP for PCM INFO
2014-09-10 8:40 ` Qiao Zhou
@ 2014-09-10 8:40 ` Qiao Zhou
-1 siblings, 0 replies; 10+ messages in thread
From: Qiao Zhou @ 2014-09-10 8:40 UTC (permalink / raw)
To: dan.j.williams, vinod.koul, dmaengine, zhangfei.gao, eric.y.miao,
haojian.zhuang, linux, lgirdwood, broonie, perex, tiwai,
alsa-devel, linux-arm-kernel
Cc: Qiao Zhou
add NO_PERIOD_WAKEUP to PCM INFO, which supports audio no IRQ mode
Signed-off-by: Qiao Zhou <zhouqiao@marvell.com>
---
sound/soc/pxa/mmp-pcm.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/sound/soc/pxa/mmp-pcm.c b/sound/soc/pxa/mmp-pcm.c
index 5e8d813..64e8b94 100644
--- a/sound/soc/pxa/mmp-pcm.c
+++ b/sound/soc/pxa/mmp-pcm.c
@@ -34,7 +34,8 @@ struct mmp_dma_data {
SNDRV_PCM_INFO_MMAP_VALID | \
SNDRV_PCM_INFO_INTERLEAVED | \
SNDRV_PCM_INFO_PAUSE | \
- SNDRV_PCM_INFO_RESUME)
+ SNDRV_PCM_INFO_RESUME | \
+ SNDRV_PCM_INFO_NO_PERIOD_WAKEUP)
static struct snd_pcm_hardware mmp_pcm_hardware[] = {
{
--
1.7.0.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 2/2] ASoC: mmp-pcm: add NO_PERIOD_WAKEUP for PCM INFO
@ 2014-09-10 8:40 ` Qiao Zhou
0 siblings, 0 replies; 10+ messages in thread
From: Qiao Zhou @ 2014-09-10 8:40 UTC (permalink / raw)
To: linux-arm-kernel
add NO_PERIOD_WAKEUP to PCM INFO, which supports audio no IRQ mode
Signed-off-by: Qiao Zhou <zhouqiao@marvell.com>
---
sound/soc/pxa/mmp-pcm.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/sound/soc/pxa/mmp-pcm.c b/sound/soc/pxa/mmp-pcm.c
index 5e8d813..64e8b94 100644
--- a/sound/soc/pxa/mmp-pcm.c
+++ b/sound/soc/pxa/mmp-pcm.c
@@ -34,7 +34,8 @@ struct mmp_dma_data {
SNDRV_PCM_INFO_MMAP_VALID | \
SNDRV_PCM_INFO_INTERLEAVED | \
SNDRV_PCM_INFO_PAUSE | \
- SNDRV_PCM_INFO_RESUME)
+ SNDRV_PCM_INFO_RESUME | \
+ SNDRV_PCM_INFO_NO_PERIOD_WAKEUP)
static struct snd_pcm_hardware mmp_pcm_hardware[] = {
{
--
1.7.0.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 2/2] ASoC: mmp-pcm: add NO_PERIOD_WAKEUP for PCM INFO
2014-09-10 8:40 ` Qiao Zhou
@ 2014-09-10 9:41 ` Mark Brown
-1 siblings, 0 replies; 10+ messages in thread
From: Mark Brown @ 2014-09-10 9:41 UTC (permalink / raw)
To: Qiao Zhou
Cc: alsa-devel, eric.y.miao, vinod.koul, lgirdwood, haojian.zhuang,
tiwai, zhangfei.gao, dmaengine, linux, dan.j.williams,
linux-arm-kernel
[-- Attachment #1.1: Type: text/plain, Size: 171 bytes --]
On Wed, Sep 10, 2014 at 04:40:49PM +0800, Qiao Zhou wrote:
> add NO_PERIOD_WAKEUP to PCM INFO, which supports audio no IRQ mode
Acked-by: Mark Brown <broonie@linaro.org>
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] ASoC: mmp-pcm: add NO_PERIOD_WAKEUP for PCM INFO
2014-09-10 8:40 ` Qiao Zhou
@ 2014-09-11 5:19 ` Vinod Koul
-1 siblings, 0 replies; 10+ messages in thread
From: Vinod Koul @ 2014-09-11 5:19 UTC (permalink / raw)
To: Qiao Zhou
Cc: alsa-devel, linux, tiwai, lgirdwood, haojian.zhuang, broonie,
zhangfei.gao, dmaengine, eric.y.miao, dan.j.williams,
linux-arm-kernel
On Wed, Sep 10, 2014 at 04:40:49PM +0800, Qiao Zhou wrote:
> add NO_PERIOD_WAKEUP to PCM INFO, which supports audio no IRQ mode
Applied, thanks
--
~Vinod
>
> Signed-off-by: Qiao Zhou <zhouqiao@marvell.com>
> ---
> sound/soc/pxa/mmp-pcm.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/sound/soc/pxa/mmp-pcm.c b/sound/soc/pxa/mmp-pcm.c
> index 5e8d813..64e8b94 100644
> --- a/sound/soc/pxa/mmp-pcm.c
> +++ b/sound/soc/pxa/mmp-pcm.c
> @@ -34,7 +34,8 @@ struct mmp_dma_data {
> SNDRV_PCM_INFO_MMAP_VALID | \
> SNDRV_PCM_INFO_INTERLEAVED | \
> SNDRV_PCM_INFO_PAUSE | \
> - SNDRV_PCM_INFO_RESUME)
> + SNDRV_PCM_INFO_RESUME | \
> + SNDRV_PCM_INFO_NO_PERIOD_WAKEUP)
>
> static struct snd_pcm_hardware mmp_pcm_hardware[] = {
> {
> --
> 1.7.0.4
>
--
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 2/2] ASoC: mmp-pcm: add NO_PERIOD_WAKEUP for PCM INFO
@ 2014-09-11 5:19 ` Vinod Koul
0 siblings, 0 replies; 10+ messages in thread
From: Vinod Koul @ 2014-09-11 5:19 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Sep 10, 2014 at 04:40:49PM +0800, Qiao Zhou wrote:
> add NO_PERIOD_WAKEUP to PCM INFO, which supports audio no IRQ mode
Applied, thanks
--
~Vinod
>
> Signed-off-by: Qiao Zhou <zhouqiao@marvell.com>
> ---
> sound/soc/pxa/mmp-pcm.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/sound/soc/pxa/mmp-pcm.c b/sound/soc/pxa/mmp-pcm.c
> index 5e8d813..64e8b94 100644
> --- a/sound/soc/pxa/mmp-pcm.c
> +++ b/sound/soc/pxa/mmp-pcm.c
> @@ -34,7 +34,8 @@ struct mmp_dma_data {
> SNDRV_PCM_INFO_MMAP_VALID | \
> SNDRV_PCM_INFO_INTERLEAVED | \
> SNDRV_PCM_INFO_PAUSE | \
> - SNDRV_PCM_INFO_RESUME)
> + SNDRV_PCM_INFO_RESUME | \
> + SNDRV_PCM_INFO_NO_PERIOD_WAKEUP)
>
> static struct snd_pcm_hardware mmp_pcm_hardware[] = {
> {
> --
> 1.7.0.4
>
--
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] dma: mmp_tdma: add DMA_PREP_INTERRUPT flag support
2014-09-10 8:40 ` Qiao Zhou
@ 2014-09-11 5:18 ` Vinod Koul
-1 siblings, 0 replies; 10+ messages in thread
From: Vinod Koul @ 2014-09-11 5:18 UTC (permalink / raw)
To: Qiao Zhou
Cc: alsa-devel, linux, tiwai, lgirdwood, haojian.zhuang, broonie,
zhangfei.gao, dmaengine, eric.y.miao, dan.j.williams,
linux-arm-kernel
On Wed, Sep 10, 2014 at 04:40:48PM +0800, Qiao Zhou wrote:
> add DMA_PREP_INTERRUPT flag to support no_period_wakeup, in which
> user space app doesn't want audio interrupt to wake up audio threads.
>
Applied now, after fixing subsystem name.
--
~Vinod
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2014-09-11 5:43 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-10 8:40 [PATCH 1/2] dma: mmp_tdma: add DMA_PREP_INTERRUPT flag support Qiao Zhou
2014-09-10 8:40 ` Qiao Zhou
2014-09-10 8:40 ` [PATCH 2/2] ASoC: mmp-pcm: add NO_PERIOD_WAKEUP for PCM INFO Qiao Zhou
2014-09-10 8:40 ` Qiao Zhou
2014-09-10 9:41 ` Mark Brown
2014-09-10 9:41 ` Mark Brown
2014-09-11 5:19 ` Vinod Koul
2014-09-11 5:19 ` Vinod Koul
2014-09-11 5:18 ` [PATCH 1/2] dma: mmp_tdma: add DMA_PREP_INTERRUPT flag support Vinod Koul
2014-09-11 5:18 ` Vinod Koul
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.