* [PATCH v4] Sound: PXA: Fix settings of PXAxxx DMA
@ 2015-01-29 10:58 Petr Cvek
2015-01-29 11:02 ` Daniel Mack
2015-01-29 12:45 ` Petr Cvek
0 siblings, 2 replies; 14+ messages in thread
From: Petr Cvek @ 2015-01-29 10:58 UTC (permalink / raw)
To: linux-arm-kernel
Fix PXA DMA autoincrementation, so capture will not use playback settings
(incrementation in register space instead in target buffer).
Signed-off-by: Petr Cvek <petr.cvek@tul.cz>
---
sound/arm/pxa2xx-pcm-lib.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c
index 01f8fdc..f8ca3ca 100644
--- a/sound/arm/pxa2xx-pcm-lib.c
+++ b/sound/arm/pxa2xx-pcm-lib.c
@@ -45,7 +45,12 @@ int __pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream,
size_t period = params_period_bytes(params);
pxa_dma_desc *dma_desc;
dma_addr_t dma_buff_phys, next_desc_phys;
- u32 dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG;
+ u32 dcmd = 0;
+
+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+ dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG;
+ else
+ dcmd = DCMD_INCTRGADDR | DCMD_FLOWSRC;
/* temporary transition hack */
switch (rtd->params->addr_width) {
--
1.7.12.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v4] Sound: PXA: Fix settings of PXAxxx DMA
2015-01-29 10:58 [PATCH v4] Sound: PXA: Fix settings of PXAxxx DMA Petr Cvek
@ 2015-01-29 11:02 ` Daniel Mack
2015-01-29 11:05 ` Daniel Mack
2015-01-29 12:45 ` Petr Cvek
1 sibling, 1 reply; 14+ messages in thread
From: Daniel Mack @ 2015-01-29 11:02 UTC (permalink / raw)
To: linux-arm-kernel
On 01/29/2015 11:58 AM, Petr Cvek wrote:
> Fix PXA DMA autoincrementation, so capture will not use playback settings
> (incrementation in register space instead in target buffer).
>
> Signed-off-by: Petr Cvek <petr.cvek@tul.cz>
Yes, that's actually a regression from d65a14587 ("ASoC: pxa: use
snd_dmaengine_dai_dma_data"). Your fix seems right to me, thanks for
spotting this.
Acked-by: Daniel Mack <daniel@zonque.org>
Daniel
> ---
> sound/arm/pxa2xx-pcm-lib.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c
> index 01f8fdc..f8ca3ca 100644
> --- a/sound/arm/pxa2xx-pcm-lib.c
> +++ b/sound/arm/pxa2xx-pcm-lib.c
> @@ -45,7 +45,12 @@ int __pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream,
> size_t period = params_period_bytes(params);
> pxa_dma_desc *dma_desc;
> dma_addr_t dma_buff_phys, next_desc_phys;
> - u32 dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG;
> + u32 dcmd = 0;
> +
> + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
> + dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG;
> + else
> + dcmd = DCMD_INCTRGADDR | DCMD_FLOWSRC;
>
> /* temporary transition hack */
> switch (rtd->params->addr_width) {
>
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH v4] Sound: PXA: Fix settings of PXAxxx DMA
2015-01-29 11:02 ` Daniel Mack
@ 2015-01-29 11:05 ` Daniel Mack
2015-01-29 11:24 ` Mark Brown
0 siblings, 1 reply; 14+ messages in thread
From: Daniel Mack @ 2015-01-29 11:05 UTC (permalink / raw)
To: linux-arm-kernel
On 01/29/2015 12:02 PM, Daniel Mack wrote:
> On 01/29/2015 11:58 AM, Petr Cvek wrote:
>> Fix PXA DMA autoincrementation, so capture will not use playback settings
>> (incrementation in register space instead in target buffer).
>>
>> Signed-off-by: Petr Cvek <petr.cvek@tul.cz>
>
> Yes, that's actually a regression from d65a14587 ("ASoC: pxa: use
> snd_dmaengine_dai_dma_data"). Your fix seems right to me, thanks for
> spotting this.
>
> Acked-by: Daniel Mack <daniel@zonque.org>
However, as this should go through the ASoC tree, please make sure to
Cc: its maintainers.
Mark, do you need a resend of this patch?
Thanks,
Daniel
>
>
> Daniel
>
>> ---
>> sound/arm/pxa2xx-pcm-lib.c | 7 ++++++-
>> 1 file changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c
>> index 01f8fdc..f8ca3ca 100644
>> --- a/sound/arm/pxa2xx-pcm-lib.c
>> +++ b/sound/arm/pxa2xx-pcm-lib.c
>> @@ -45,7 +45,12 @@ int __pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream,
>> size_t period = params_period_bytes(params);
>> pxa_dma_desc *dma_desc;
>> dma_addr_t dma_buff_phys, next_desc_phys;
>> - u32 dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG;
>> + u32 dcmd = 0;
>> +
>> + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
>> + dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG;
>> + else
>> + dcmd = DCMD_INCTRGADDR | DCMD_FLOWSRC;
>>
>> /* temporary transition hack */
>> switch (rtd->params->addr_width) {
>>
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [RESEND PATCH v4] Sound: PXA: Fix settings of PXAxxx DMA
2015-01-29 10:58 [PATCH v4] Sound: PXA: Fix settings of PXAxxx DMA Petr Cvek
@ 2015-01-29 12:45 ` Petr Cvek
2015-01-29 12:45 ` Petr Cvek
1 sibling, 0 replies; 14+ messages in thread
From: Petr Cvek @ 2015-01-29 12:45 UTC (permalink / raw)
To: broonie
Cc: alsa-devel, lgirdwood, haojian.zhuang, daniel, robert.jarzmik,
linux-arm-kernel
Fix PXA DMA autoincrementation, so capture will not use playback settings
(incrementation in register space instead in target buffer).
Regression from:
'commit d65a14587a9be853a887a1407db133df1fb68e29 ("ASoC: pxa: use snd_dmaengine_dai_dma_data")'
Signed-off-by: Petr Cvek <petr.cvek@tul.cz>
Acked-by: Daniel Mack <daniel@zonque.org>
---
sound/arm/pxa2xx-pcm-lib.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c
index 01f8fdc..f8ca3ca 100644
--- a/sound/arm/pxa2xx-pcm-lib.c
+++ b/sound/arm/pxa2xx-pcm-lib.c
@@ -45,7 +45,12 @@ int __pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream,
size_t period = params_period_bytes(params);
pxa_dma_desc *dma_desc;
dma_addr_t dma_buff_phys, next_desc_phys;
- u32 dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG;
+ u32 dcmd = 0;
+
+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+ dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG;
+ else
+ dcmd = DCMD_INCTRGADDR | DCMD_FLOWSRC;
/* temporary transition hack */
switch (rtd->params->addr_width) {
--
1.7.12.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [RESEND PATCH v4] Sound: PXA: Fix settings of PXAxxx DMA
@ 2015-01-29 12:45 ` Petr Cvek
0 siblings, 0 replies; 14+ messages in thread
From: Petr Cvek @ 2015-01-29 12:45 UTC (permalink / raw)
To: linux-arm-kernel
Fix PXA DMA autoincrementation, so capture will not use playback settings
(incrementation in register space instead in target buffer).
Regression from:
'commit d65a14587a9be853a887a1407db133df1fb68e29 ("ASoC: pxa: use snd_dmaengine_dai_dma_data")'
Signed-off-by: Petr Cvek <petr.cvek@tul.cz>
Acked-by: Daniel Mack <daniel@zonque.org>
---
sound/arm/pxa2xx-pcm-lib.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c
index 01f8fdc..f8ca3ca 100644
--- a/sound/arm/pxa2xx-pcm-lib.c
+++ b/sound/arm/pxa2xx-pcm-lib.c
@@ -45,7 +45,12 @@ int __pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream,
size_t period = params_period_bytes(params);
pxa_dma_desc *dma_desc;
dma_addr_t dma_buff_phys, next_desc_phys;
- u32 dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG;
+ u32 dcmd = 0;
+
+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+ dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG;
+ else
+ dcmd = DCMD_INCTRGADDR | DCMD_FLOWSRC;
/* temporary transition hack */
switch (rtd->params->addr_width) {
--
1.7.12.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [RESEND PATCH v4] Sound: PXA: Fix settings of PXAxxx DMA
2015-01-29 12:45 ` Petr Cvek
@ 2015-01-29 19:43 ` Robert Jarzmik
-1 siblings, 0 replies; 14+ messages in thread
From: Robert Jarzmik @ 2015-01-29 19:43 UTC (permalink / raw)
To: Petr Cvek
Cc: alsa-devel, lgirdwood, haojian.zhuang, broonie, daniel, linux-arm-kernel
Petr Cvek <petr.cvek@tul.cz> writes:
> Fix PXA DMA autoincrementation, so capture will not use playback settings
> (incrementation in register space instead in target buffer).
>
> Regression from:
> 'commit d65a14587a9be853a887a1407db133df1fb68e29 ("ASoC: pxa: use snd_dmaengine_dai_dma_data")'
>
> Signed-off-by: Petr Cvek <petr.cvek@tul.cz>
> Acked-by: Daniel Mack <daniel@zonque.org>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
--
Robert
^ permalink raw reply [flat|nested] 14+ messages in thread* [RESEND PATCH v4] Sound: PXA: Fix settings of PXAxxx DMA
@ 2015-01-29 19:43 ` Robert Jarzmik
0 siblings, 0 replies; 14+ messages in thread
From: Robert Jarzmik @ 2015-01-29 19:43 UTC (permalink / raw)
To: linux-arm-kernel
Petr Cvek <petr.cvek@tul.cz> writes:
> Fix PXA DMA autoincrementation, so capture will not use playback settings
> (incrementation in register space instead in target buffer).
>
> Regression from:
> 'commit d65a14587a9be853a887a1407db133df1fb68e29 ("ASoC: pxa: use snd_dmaengine_dai_dma_data")'
>
> Signed-off-by: Petr Cvek <petr.cvek@tul.cz>
> Acked-by: Daniel Mack <daniel@zonque.org>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
--
Robert
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v4] Sound: PXA: Fix settings of PXAxxx DMA
2015-01-29 12:45 ` Petr Cvek
@ 2015-02-27 12:15 ` Petr Cvek
-1 siblings, 0 replies; 14+ messages in thread
From: Petr Cvek @ 2015-02-27 12:15 UTC (permalink / raw)
To: broonie
Cc: alsa-devel, lgirdwood, haojian.zhuang, daniel, robert.jarzmik,
linux-arm-kernel
bump
On 29.1.2015 13:45, Petr Cvek wrote:
> Fix PXA DMA autoincrementation, so capture will not use playback settings
> (incrementation in register space instead in target buffer).
>
> Regression from:
> 'commit d65a14587a9be853a887a1407db133df1fb68e29 ("ASoC: pxa: use snd_dmaengine_dai_dma_data")'
>
> Signed-off-by: Petr Cvek <petr.cvek@tul.cz>
> Acked-by: Daniel Mack <daniel@zonque.org>
> ---
> sound/arm/pxa2xx-pcm-lib.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c
> index 01f8fdc..f8ca3ca 100644
> --- a/sound/arm/pxa2xx-pcm-lib.c
> +++ b/sound/arm/pxa2xx-pcm-lib.c
> @@ -45,7 +45,12 @@ int __pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream,
> size_t period = params_period_bytes(params);
> pxa_dma_desc *dma_desc;
> dma_addr_t dma_buff_phys, next_desc_phys;
> - u32 dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG;
> + u32 dcmd = 0;
> +
> + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
> + dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG;
> + else
> + dcmd = DCMD_INCTRGADDR | DCMD_FLOWSRC;
>
> /* temporary transition hack */
> switch (rtd->params->addr_width) {
>
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH v4] Sound: PXA: Fix settings of PXAxxx DMA
@ 2015-02-27 12:15 ` Petr Cvek
0 siblings, 0 replies; 14+ messages in thread
From: Petr Cvek @ 2015-02-27 12:15 UTC (permalink / raw)
To: linux-arm-kernel
bump
On 29.1.2015 13:45, Petr Cvek wrote:
> Fix PXA DMA autoincrementation, so capture will not use playback settings
> (incrementation in register space instead in target buffer).
>
> Regression from:
> 'commit d65a14587a9be853a887a1407db133df1fb68e29 ("ASoC: pxa: use snd_dmaengine_dai_dma_data")'
>
> Signed-off-by: Petr Cvek <petr.cvek@tul.cz>
> Acked-by: Daniel Mack <daniel@zonque.org>
> ---
> sound/arm/pxa2xx-pcm-lib.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c
> index 01f8fdc..f8ca3ca 100644
> --- a/sound/arm/pxa2xx-pcm-lib.c
> +++ b/sound/arm/pxa2xx-pcm-lib.c
> @@ -45,7 +45,12 @@ int __pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream,
> size_t period = params_period_bytes(params);
> pxa_dma_desc *dma_desc;
> dma_addr_t dma_buff_phys, next_desc_phys;
> - u32 dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG;
> + u32 dcmd = 0;
> +
> + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
> + dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG;
> + else
> + dcmd = DCMD_INCTRGADDR | DCMD_FLOWSRC;
>
> /* temporary transition hack */
> switch (rtd->params->addr_width) {
>
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH v4] Sound: PXA: Fix settings of PXAxxx DMA
2015-02-27 12:15 ` Petr Cvek
@ 2015-03-02 18:18 ` Mark Brown
-1 siblings, 0 replies; 14+ messages in thread
From: Mark Brown @ 2015-03-02 18:18 UTC (permalink / raw)
To: Petr Cvek
Cc: alsa-devel, lgirdwood, haojian.zhuang, daniel, robert.jarzmik,
linux-arm-kernel
[-- Attachment #1.1: Type: text/plain, Size: 156 bytes --]
On Fri, Feb 27, 2015 at 01:15:18PM +0100, Petr Cvek wrote:
> bump
>
> On 29.1.2015 13:45, Petr Cvek wrote:
Don't send contentless, top-posted nags.
[-- 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] 14+ messages in thread
* [PATCH v4] Sound: PXA: Fix settings of PXAxxx DMA
@ 2015-03-02 18:18 ` Mark Brown
0 siblings, 0 replies; 14+ messages in thread
From: Mark Brown @ 2015-03-02 18:18 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Feb 27, 2015 at 01:15:18PM +0100, Petr Cvek wrote:
> bump
>
> On 29.1.2015 13:45, Petr Cvek wrote:
Don't send contentless, top-posted nags.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150302/debe3663/attachment.sig>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v4] Sound: PXA: Fix settings of PXAxxx DMA
2015-03-02 18:18 ` Mark Brown
@ 2015-03-06 11:07 ` Petr Cvek
-1 siblings, 0 replies; 14+ messages in thread
From: Petr Cvek @ 2015-03-06 11:07 UTC (permalink / raw)
To: Mark Brown, alsa-devel
Cc: linux-arm-kernel, robert.jarzmik, haojian.zhuang, daniel, lgirdwood
Fix PXA DMA autoincrementation, so capture will not use playback settings
(incrementation in register space instead in target buffer).
Regression from:
'commit d65a14587a9be853a887a1407db133df1fb68e29 ("ASoC: pxa: use snd_dmaengine_dai_dma_data")'
Signed-off-by: Petr Cvek <petr.cvek@tul.cz>
Acked-by: Daniel Mack <daniel@zonque.org>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
sound/arm/pxa2xx-pcm-lib.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c
index 01f8fdc..f8ca3ca 100644
--- a/sound/arm/pxa2xx-pcm-lib.c
+++ b/sound/arm/pxa2xx-pcm-lib.c
@@ -45,7 +45,12 @@ int __pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream,
size_t period = params_period_bytes(params);
pxa_dma_desc *dma_desc;
dma_addr_t dma_buff_phys, next_desc_phys;
- u32 dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG;
+ u32 dcmd = 0;
+
+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+ dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG;
+ else
+ dcmd = DCMD_INCTRGADDR | DCMD_FLOWSRC;
/* temporary transition hack */
switch (rtd->params->addr_width) {
-- 1.7.12.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v4] Sound: PXA: Fix settings of PXAxxx DMA
@ 2015-03-06 11:07 ` Petr Cvek
0 siblings, 0 replies; 14+ messages in thread
From: Petr Cvek @ 2015-03-06 11:07 UTC (permalink / raw)
To: linux-arm-kernel
Fix PXA DMA autoincrementation, so capture will not use playback settings
(incrementation in register space instead in target buffer).
Regression from:
'commit d65a14587a9be853a887a1407db133df1fb68e29 ("ASoC: pxa: use snd_dmaengine_dai_dma_data")'
Signed-off-by: Petr Cvek <petr.cvek@tul.cz>
Acked-by: Daniel Mack <daniel@zonque.org>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
sound/arm/pxa2xx-pcm-lib.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c
index 01f8fdc..f8ca3ca 100644
--- a/sound/arm/pxa2xx-pcm-lib.c
+++ b/sound/arm/pxa2xx-pcm-lib.c
@@ -45,7 +45,12 @@ int __pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream,
size_t period = params_period_bytes(params);
pxa_dma_desc *dma_desc;
dma_addr_t dma_buff_phys, next_desc_phys;
- u32 dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG;
+ u32 dcmd = 0;
+
+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+ dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG;
+ else
+ dcmd = DCMD_INCTRGADDR | DCMD_FLOWSRC;
/* temporary transition hack */
switch (rtd->params->addr_width) {
-- 1.7.12.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
end of thread, other threads:[~2015-03-06 11:07 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-29 10:58 [PATCH v4] Sound: PXA: Fix settings of PXAxxx DMA Petr Cvek
2015-01-29 11:02 ` Daniel Mack
2015-01-29 11:05 ` Daniel Mack
2015-01-29 11:24 ` Mark Brown
2015-01-29 12:45 ` [RESEND PATCH " Petr Cvek
2015-01-29 12:45 ` Petr Cvek
2015-01-29 19:43 ` Robert Jarzmik
2015-01-29 19:43 ` Robert Jarzmik
2015-02-27 12:15 ` [PATCH " Petr Cvek
2015-02-27 12:15 ` Petr Cvek
2015-03-02 18:18 ` Mark Brown
2015-03-02 18:18 ` Mark Brown
2015-03-06 11:07 ` Petr Cvek
2015-03-06 11:07 ` Petr Cvek
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.