October 2018 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH linux-next v2 8/9] ASoC: rsnd: ssi: Request dedicated dma channels for busif0 to 7
by jiada_wang＠mentor.com 04 Oct '18

04 Oct '18

From: Jiada Wang <jiada_wang(a)mentor.com> Currently ssi driver only request dma channel for SSI_0, which is used to transfer data to/from busif0. But in GEN3 busif1 to busif7 also maybe used, dedicated dma channels are requested for data transfer through these busif. Signed-off-by: Jiada Wang <jiada_wang(a)mentor.com> --- sound/soc/sh/rcar/ssi.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 3adcc4f778f7..992aeac09e76 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -76,6 +76,8 @@ #define SSI_NAME "ssi" +#define SSI_DMA_NAME_SIZE 10 + struct rsnd_ssi { struct rsnd_mod mod; @@ -938,12 +940,28 @@ static struct dma_chan *rsnd_ssi_dma_req(struct rsnd_dai_stream *io, { struct rsnd_priv *priv = rsnd_mod_to_priv(mod); int is_play = rsnd_io_is_play(io); - char *name; + char name[SSI_DMA_NAME_SIZE]; - if (rsnd_ssi_use_busif(io)) - name = is_play ? "rxu" : "txu"; - else - name = is_play ? "rx" : "tx"; + if (rsnd_ssi_use_busif(io)) { + if (is_play) + snprintf(name, SSI_DMA_NAME_SIZE, "rxu"); + else + snprintf(name, SSI_DMA_NAME_SIZE, "txu"); + + if (rsnd_is_gen3(priv)) { + /* + * Gen3 supports to use all available BUSIF + */ + int busif = rsnd_ssi_get_busif(io); + + snprintf(name, SSI_DMA_NAME_SIZE, "%s%d", name, busif); + } + } else { + if (is_play) + snprintf(name, SSI_DMA_NAME_SIZE, "rx"); + else + snprintf(name, SSI_DMA_NAME_SIZE, "tx"); + } return rsnd_dma_request_channel(rsnd_ssi_of_node(priv), mod, name); -- 2.17.0

3 2

[alsa-devel] [PATCH] ALSA: intel8x0: Fix fall-through annotations
by Gustavo A. R. Silva 03 Oct '18

03 Oct '18

Replace "fallthru" with a proper "fall through" annotation. This fix is part of the ongoing efforts to enabling -Wimplicit-fallthrough Signed-off-by: Gustavo A. R. Silva <gustavo(a)embeddedor.com> --- sound/pci/intel8x0.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index 9517f9b..ffddcdf 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c @@ -825,7 +825,7 @@ static int snd_intel8x0_pcm_trigger(struct snd_pcm_substream *substream, int cmd switch (cmd) { case SNDRV_PCM_TRIGGER_RESUME: ichdev->suspended = 0; - /* fallthru */ + /* fall through */ case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: val = ICH_IOCE | ICH_STARTBM; @@ -833,7 +833,7 @@ static int snd_intel8x0_pcm_trigger(struct snd_pcm_substream *substream, int cmd break; case SNDRV_PCM_TRIGGER_SUSPEND: ichdev->suspended = 1; - /* fallthru */ + /* fall through */ case SNDRV_PCM_TRIGGER_STOP: val = 0; break; @@ -867,7 +867,7 @@ static int snd_intel8x0_ali_trigger(struct snd_pcm_substream *substream, int cmd switch (cmd) { case SNDRV_PCM_TRIGGER_RESUME: ichdev->suspended = 0; - /* fallthru */ + /* fall through */ case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { @@ -884,7 +884,7 @@ static int snd_intel8x0_ali_trigger(struct snd_pcm_substream *substream, int cmd break; case SNDRV_PCM_TRIGGER_SUSPEND: ichdev->suspended = 1; - /* fallthru */ + /* fall through */ case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_PAUSE_PUSH: /* pause */ -- 2.7.4

2 5

[alsa-devel] [PATCH linux-next v2 7/9] arm64: r8a77965: change to use extended audio dmac register
by jiada_wang＠mentor.com 03 Oct '18

03 Oct '18

From: Jiada Wang <jiada_wang(a)mentor.com> Basic audio dmac register only supports busif from 0 to 3, in order to use busif4 ~ busif7, extended audio dmac register need to be used. Signed-off-by: Jiada Wang <jiada_wang(a)mentor.com> --- arch/arm64/boot/dts/renesas/r8a77965.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/renesas/r8a77965.dtsi b/arch/arm64/boot/dts/renesas/r8a77965.dtsi index fd00010a5ed7..6c0d5053a81c 100644 --- a/arch/arm64/boot/dts/renesas/r8a77965.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a77965.dtsi @@ -1405,7 +1405,7 @@ <0 0xec5a0000 0 0x100>, /* ADG */ <0 0xec540000 0 0x1000>, /* SSIU */ <0 0xec541000 0 0x280>, /* SSI */ - <0 0xec740000 0 0x200>; /* Audio DMAC peri peri*/ + <0 0xec760000 0 0x200>; /* Audio DMAC peri peri*/ /* placeholder */ rcar_sound,dvc { -- 2.17.0

1 0

[alsa-devel] [PATCH linux-next v2 6/9] arm64: r8a774a1: change to use extended audio dmac register
by jiada_wang＠mentor.com 03 Oct '18

03 Oct '18

From: Jiada Wang <jiada_wang(a)mentor.com> Basic audio dmac register only supports busif from 0 to 3, in order to use busif4 ~ busif7, extended audio dmac register need to be used. Signed-off-by: Jiada Wang <jiada_wang(a)mentor.com> --- arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi index ad2c9c0148ae..c04ca03f2987 100644 --- a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi @@ -1120,7 +1120,7 @@ <0 0xec5a0000 0 0x100>, /* ADG */ <0 0xec540000 0 0x1000>, /* SSIU */ <0 0xec541000 0 0x280>, /* SSI */ - <0 0xec740000 0 0x200>; /* Audio DMAC peri peri*/ + <0 0xec760000 0 0x200>; /* Audio DMAC peri peri*/ reg-names = "scu", "adg", "ssiu", "ssi", "audmapp"; clocks = <&cpg CPG_MOD 1005>, -- 2.17.0

1 0

[alsa-devel] [PATCH linux-next v2 5/9] arm64: r8a7796: change to use extended audio dmac register
by jiada_wang＠mentor.com 03 Oct '18

03 Oct '18

From: Jiada Wang <jiada_wang(a)mentor.com> Basic audio dmac register only supports busif from 0 to 3, in order to use busif4 ~ busif7, extended audio dmac register need to be used. Signed-off-by: Jiada Wang <jiada_wang(a)mentor.com> --- arch/arm64/boot/dts/renesas/r8a7796.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi index 53b361c5b16d..4526f62ee1f0 100644 --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi @@ -1670,7 +1670,7 @@ <0 0xec5a0000 0 0x100>, /* ADG */ <0 0xec540000 0 0x1000>, /* SSIU */ <0 0xec541000 0 0x280>, /* SSI */ - <0 0xec740000 0 0x200>; /* Audio DMAC peri peri*/ + <0 0xec760000 0 0x200>; /* Audio DMAC peri peri*/ reg-names = "scu", "adg", "ssiu", "ssi", "audmapp"; clocks = <&cpg CPG_MOD 1005>, -- 2.17.0

1 0

[alsa-devel] snd_pcm_poll_descriptors() error return
by Alan Horstmann 02 Oct '18

02 Oct '18

Hi, A user of the Portaudio library is reporting that from Alsa version 1.1.4 the function snd_pcm_poll_descriptors() can return -32 (Broken Pipe), and this fails an assert within Portaudio. Earlier 1.1.3 does not seem to show this issue. For more details, see https://app.assembla.com/spaces/portaudio/support/tickets/268. The Alsa docs don't mention any possible negative error code from this function - has the behaviour changed, or is it likely something else is triggering the difference? Regards Alan

3 3

[alsa-devel] Thread spinning in kernel snd_pcm_link()/snd_pcm_unlink()
by Rob Duncan 02 Oct '18

02 Oct '18

I'm trying to address a bug where we end up with a thread spinning and consuming an entire cpu. The issue seems to be this code in sound/core/pcm_native.c: /* Writer in rwsem may block readers even during its waiting in queue, * and this may lead to a deadlock when the code path takes read sem * twice (e.g. one in snd_pcm_action_nonatomic() and another in * snd_pcm_stream_lock()). As a (suboptimal) workaround, let writer to * spin until it gets the lock. */ static inline void down_write_nonblock(struct rw_semaphore *lock) { while (!down_write_trylock(lock)) cond_resched(); } The original commit for this is 67ec1072b053c15564e6090ab30127895dc77a89 What we're suspecting is that a normal thread (SCHED_OTHER) has a reader lock and a real-time thread using SCHED_RR or SCHED_FIFO is trying to take the writer lock. If both threads are pinned to the same CPU for some reason then the reader thread will never get scheduled (because the real-time writer thread is still runnable), and we will never make progress. Does this sound right? What can we do to fix this? Thanks, Rob.

2 2

[alsa-devel] [PATCH alsa-lib] ioplug: Fix comment in struct snd_pcm_ioplug
by Andre Guedes 02 Oct '18

02 Oct '18

This patch fixes the comment about 'pcm' field in 'struct snd_pcm_ioplug' which wrongly refers to snd_pcm_extplug_create(). Signed-off-by: Andre Guedes <andre.guedes(a)intel.com> --- include/pcm_ioplug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/pcm_ioplug.h b/include/pcm_ioplug.h index b16fc8b8..81ac8613 100644 --- a/include/pcm_ioplug.h +++ b/include/pcm_ioplug.h @@ -105,7 +105,7 @@ struct snd_pcm_ioplug { */ void *private_data; /** - * PCM handle filled by #snd_pcm_extplug_create() + * PCM handle filled by #snd_pcm_ioplug_create() */ snd_pcm_t *pcm; -- 2.14.4

3 2

[alsa-devel] [PATCH - Multiple plugins 0/4] Fix leaks on multiple plugins
by Andre Guedes 02 Oct '18

02 Oct '18

Hi all, While I was working on AAF plugin RFC v2 series [1], I spotted several leaks in some plugins when handling *_hw_constraint() error cases. This series fixes these issues. Regards, Andre [1] http://mailman.alsa-project.org/pipermail/alsa-devel/2018-September/140290.… Andre Guedes (4): a52: Fix leaks when a52_set_hw_constraint() fails jack: Fix leaks when jack_set_hw_constraint() fails oss: Fix leaks when oss_hw_constraint() fails usb_stream: Fix leaks when us_set_hw_constraint() fails a52/pcm_a52.c | 2 +- jack/pcm_jack.c | 1 + oss/pcm_oss.c | 2 +- usb_stream/pcm_usb_stream.c | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) -- 2.14.4

3 6

[alsa-devel] [PATCH] ALSA: sb8: Fix fall-through annotations
by Gustavo A. R. Silva 02 Oct '18

02 Oct '18

Replace "fallthru" with a proper "fall through" annotation. This fix is part of the ongoing efforts to enabling -Wimplicit-fallthrough Signed-off-by: Gustavo A. R. Silva <gustavo(a)embeddedor.com> --- sound/isa/sb/sb8_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/isa/sb/sb8_main.c b/sound/isa/sb/sb8_main.c index 4817977..8288fae 100644 --- a/sound/isa/sb/sb8_main.c +++ b/sound/isa/sb/sb8_main.c @@ -130,13 +130,13 @@ static int snd_sb8_playback_prepare(struct snd_pcm_substream *substream) chip->playback_format = SB_DSP_HI_OUTPUT_AUTO; break; } - /* fallthru */ + /* fall through */ case SB_HW_201: if (rate > 23000) { chip->playback_format = SB_DSP_HI_OUTPUT_AUTO; break; } - /* fallthru */ + /* fall through */ case SB_HW_20: chip->playback_format = SB_DSP_LO_OUTPUT_AUTO; break; @@ -287,7 +287,7 @@ static int snd_sb8_capture_prepare(struct snd_pcm_substream *substream) chip->capture_format = SB_DSP_HI_INPUT_AUTO; break; } - /* fallthru */ + /* fall through */ case SB_HW_20: chip->capture_format = SB_DSP_LO_INPUT_AUTO; break; @@ -387,7 +387,7 @@ irqreturn_t snd_sb8dsp_interrupt(struct snd_sb *chip) case SB_MODE_PLAYBACK_16: /* ok.. playback is active */ if (chip->hardware != SB_HW_JAZZ16) break; - /* fallthru */ + /* fall through */ case SB_MODE_PLAYBACK_8: substream = chip->playback_substream; if (chip->playback_format == SB_DSP_OUTPUT) @@ -397,7 +397,7 @@ irqreturn_t snd_sb8dsp_interrupt(struct snd_sb *chip) case SB_MODE_CAPTURE_16: if (chip->hardware != SB_HW_JAZZ16) break; - /* fallthru */ + /* fall through */ case SB_MODE_CAPTURE_8: substream = chip->capture_substream; if (chip->capture_format == SB_DSP_INPUT) -- 2.7.4

2 1