May 2017 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ASoC: wm_adsp: Fix typo in algorithm list warning message
by Richard Fitzgerald 26 May '17

26 May '17

The list terminator is 0xbedead but the message warning if it wasn't found was showing that 0xbeadead was expected. Signed-off-by: Richard Fitzgerald <rf(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm_adsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 5aff83b..65c059b5 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -1888,7 +1888,7 @@ static void *wm_adsp_read_algs(struct wm_adsp *dsp, size_t n_algs, } if (be32_to_cpu(val) != 0xbedead) - adsp_warn(dsp, "Algorithm list end %x 0x%x != 0xbeadead\n", + adsp_warn(dsp, "Algorithm list end %x 0x%x != 0xbedead\n", pos + len, be32_to_cpu(val)); alg = kzalloc(len * 2, GFP_KERNEL | GFP_DMA); -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: rsnd: fixup parent_clk_name of AUDIO_CLKOUTx
by Kuninori Morimoto 26 May '17

26 May '17

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> commit 25165f79adc7 ("ASoC: rsnd: enable clock-frequency for both 44.1kHz/48kHz") supported both 44.1kHz/48kHz for AUDIO_CLKOUTx, but it didn't care its parent clock name. This patch fixes it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/sh/rcar/adg.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c index 36bece8..4a72fd7 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -510,7 +510,8 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv, rbga = rbgx; adg->rbga_rate_for_441khz = rate / div; ckr |= brg_table[i] << 20; - if (req_441kHz_rate) + if (req_441kHz_rate && + !(adg_mode_flags(adg) & AUDIO_OUT_48)) parent_clk_name = __clk_get_name(clk); } } @@ -525,7 +526,8 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv, rbgb = rbgx; adg->rbgb_rate_for_48khz = rate / div; ckr |= brg_table[i] << 16; - if (req_48kHz_rate) + if (req_48kHz_rate && + (adg_mode_flags(adg) & AUDIO_OUT_48)) parent_clk_name = __clk_get_name(clk); } } -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: simple-card-utils: remove strict limitation of bit/frame master
by Kuninori Morimoto 26 May '17

26 May '17

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Current asoc_simple_card_parse_daifmt is keeping backward compatibility for bitmaster/framemaster which didn't use phandle. The keep compatibility, it is checking prefix length, but it is too strict. let's loosen it. Otherwise, OF-graph base sound card which doesn't have prefix can't detect daifmt. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/generic/simple-card-utils.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index b5047e2..f5a3e32 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -21,14 +21,13 @@ int asoc_simple_card_parse_daifmt(struct device *dev, { struct device_node *bitclkmaster = NULL; struct device_node *framemaster = NULL; - int prefix_len = prefix ? strlen(prefix) : 0; unsigned int daifmt; daifmt = snd_soc_of_parse_daifmt(node, prefix, &bitclkmaster, &framemaster); daifmt &= ~SND_SOC_DAIFMT_MASTER_MASK; - if (prefix_len && !bitclkmaster && !framemaster) { + if (!bitclkmaster && !framemaster) { /* * No dai-link level and master setting was not found from * sound node level, revert back to legacy DT parsing and -- 1.9.1

2 1

[alsa-devel] 1.1.3 bug report: dmix reports inconsistent status
by Cheng Sun 26 May '17

26 May '17

Hi all, The following commit (released in v1.1.3) introduced an issue where dmix reports its state differently when snd_pcm_state is queried, compared to snd_pcm_status. 38a2d2eda880fda9ed5a4a219db498d9c0856d71 (I suspect faf53c197cabeb1eb0fd1f66cd001d1469ebac09 affects dshare similarly, but this is not tested) The sample program attached at the bottom of this email demonstrates this behaviour by printing the following on underrun: try 1: status_state=3, state=4 try 2: status_state=3, state=4 ALSA lib pcm.c:8306:(snd_pcm_recover) underrun occurred Cheers, Cheng --- #include <assert.h> #include <alsa/asoundlib.h> #include <stdint.h> #define FRAMES 100 int32_t buffer[FRAMES][2]; int main(int argc, char *argv[]) { const char *pcmname = argc == 2 ? argv[1] : "default"; snd_pcm_t *pcm; assert( snd_pcm_open(&pcm, pcmname, SND_PCM_STREAM_PLAYBACK, 0) == 0 ); assert( snd_pcm_set_params(pcm, SND_PCM_FORMAT_S32_LE, SND_PCM_ACCESS_RW_INTERLEAVED, 2, 48000, 1, 250) == 0 ); for (;;) { snd_pcm_sframes_t written = snd_pcm_writei(pcm, buffer, FRAMES); if (written <= 0) { snd_pcm_status_t *status; snd_pcm_status_alloca(&status); assert( snd_pcm_status(pcm, status) == 0 ); int status_state, state; status_state = snd_pcm_status_get_state(status); state = snd_pcm_state(pcm); printf("try 1: status_state=%d, state=%d\n", status_state, state); status_state = snd_pcm_status_get_state(status); state = snd_pcm_state(pcm); printf("try 2: status_state=%d, state=%d\n", status_state, state); assert( snd_pcm_recover(pcm,written,0) == 0 ); } } }

1 1

Re: [alsa-devel] 1.1.4 bug report: dmix fails when using both 32-bit and 64-bit clients
by Takashi Iwai 26 May '17

26 May '17

On Thu, 25 May 2017 22:17:45 +0200, Cheng Sun wrote: > > On 25 May 2017 at 19:55, Takashi Iwai <tiwai(a)suse.de> wrote: > > On Thu, 25 May 2017 20:34:23 +0200, > > Cheng Sun wrote: > >> > >> On 25 May 2017 at 19:17, Takashi Iwai <tiwai(a)suse.de> wrote: > >> > On Thu, 25 May 2017 18:51:10 +0200, > >> > Cheng Sun wrote: > >> >> > >> >> On 25 May 2017 at 17:31, Takashi Iwai <tiwai(a)suse.de> wrote: > >> >> > On Thu, 25 May 2017 17:43:44 +0200, > >> >> > Cheng Sun wrote: > >> >> >> > >> >> >> On 25 May 2017 14:49, "Takashi Iwai" <tiwai(a)suse.de> wrote: > >> >> >> > > >> >> >> > On Wed, 24 May 2017 21:13:46 +0200, > >> >> >> > Cheng Sun wrote: > >> >> >> > > > >> >> >> > > Hi all, > >> >> >> > > > >> >> >> > > The following commit (released in v1.1.4) introduced an issue where a > >> >> >> > > client compiled against a 32-bit (x86) compile of alsa-lib cannot use > >> >> >> > > the same dmix as a client compiled against a 64-bit alsa-lib. > >> >> >> > > > >> >> >> > > 1a9bd0f0448106b917ae7f7bedccfcbf6ce84802 > >> >> >> > > > >> >> >> > > The error message is: > >> >> >> > > > >> >> >> > > ALSA lib pcm_dmix.c:1077:(snd_pcm_dmix_open) unable to create IPC > >> >> >> > > shm instance > >> >> >> > > > >> >> >> > > The following forum post (not mine) describes the symptoms of the > >> >> >> > > issue in more detail (although the git commit the poster specified is > >> >> >> > > not correct): > >> >> >> > > > >> >> >> > > > >> >> >> https://forums.gentoo.org/viewtopic-p-8072290.html?sid=c2fbca45102933ddf9ca… > >> >> >> > > >> >> >> > There is a known problem when you mix up two alsa-lib versions because > >> >> >> > of the changes in dmix shmem struct. The solution should upgrade all > >> >> >> > users. > >> >> >> > >> >> >> (Apologies for duplicate email --accidentally sent the first reply to the > >> >> >> wrong address.) > >> >> >> > >> >> >> Arch Linux has upgraded both its 32 and 64 bit packages to v1.1.4, and I'm > >> >> >> still experiencing this problem. > >> >> >> > >> >> >> While bisecting the bug I linked against two compiles of the same alsa-lib > >> >> >> versions each time. > >> >> >> > >> >> >> Let me know if I can provide any other information. > >> >> > > >> >> > OK, at first to see whether it's the issue of the struct size > >> >> > mismatch, check the following patch. If it is, you'll see the error > >> >> > message. To be sure, check both cases: 64bit -> 32bit, and 32bit -> > >> >> > 64bit. > >> >> > >> >> The behaviour is different for the two cases. > >> >> > >> >> 1) If 64bit client is started first, then the 32bit client prints the following: > >> >> > >> >> magic mismatch: shmptr=a15ad4f0, expected=a15ad4ec > >> >> ALSA lib pcm_dmix.c:1077:(snd_pcm_dmix_open) unable to create IPC shm instance > >> >> > >> >> 2) If 32bit client is started first, then the 64bit client only prints: > >> >> > >> >> ALSA lib pcm_dmix.c:1077:(snd_pcm_dmix_open) unable to create IPC shm instance > >> >> > >> >> I've added some further print statements and it turns out that this is > >> >> because the "return err;" on line 115 is triggered. > >> > > >> > Hm, so at least the struct size difference is a problem. > >> > Doese the patch below change the behavior? > >> > >> Your patch did not change the behaviour. > > > > Hmm, then it's 8 bytes alignment. > > > >> However, as an experiment I added "__attribute__((__packed__))" to the > >> struct, which fixed the problem. So this does seem to be caused by gcc > >> padding structs differently when compiling 32-bit vs 64-bit. > >> > >> I don't think "__attribute__((__packed__))" is necessarily the correct > >> solution here though. > > > > OK, that's at least one way to fix. Another way would be to put > > another 4 bytes integer as a padding. Could you give it a try, too? > > > > > > Takashi > > The following patch works. I'm a little worried that future > rearrangement/additions to the struct will cause it to break again > though... Yes, maybe the combination of both is the better way. That is, we should add packed attribute, but OTOH we should avoid the incompatibility again from 1.1.4 at least on x86-64. If a padding + packed doesn't change the struct size on x86-64 from the unpatched struct, we can go with it. Alternatively, we may move the new field into some of unused old fields. Below is an example. This will make it backward compatible with 1.1.3 and older versions. thanks, Takashi -- 8< -- --- a/src/pcm/pcm_direct.c +++ b/src/pcm/pcm_direct.c @@ -615,7 +615,7 @@ int snd_pcm_direct_slave_recover(snd_pcm } return ret; } - direct->shmptr->recoveries++; + direct->shmptr->s.recoveries++; semerr = snd_pcm_direct_semaphore_up(direct, DIRECT_IPC_SEM_CLIENT); if (semerr < 0) { @@ -631,11 +631,11 @@ int snd_pcm_direct_slave_recover(snd_pcm */ int snd_pcm_direct_client_chk_xrun(snd_pcm_direct_t *direct, snd_pcm_t *pcm) { - if (direct->shmptr->recoveries != direct->recoveries) { + if (direct->shmptr->s.recoveries != direct->recoveries) { /* no matter how many xruns we missed - * so don't increment but just update to actual counter */ - direct->recoveries = direct->shmptr->recoveries; + direct->recoveries = direct->shmptr->s.recoveries; pcm->fast_ops->drop(pcm); /* trigger_tstamp update is missing in drop callbacks */ gettimestamp(&direct->trigger_tstamp, pcm->tstamp_type); @@ -1539,7 +1539,7 @@ int snd_pcm_direct_open_secondary_client dmix->slave_buffer_size = spcm->buffer_size; dmix->slave_period_size = dmix->shmptr->s.period_size; dmix->slave_boundary = spcm->boundary; - dmix->recoveries = dmix->shmptr->recoveries; + dmix->recoveries = dmix->shmptr->s.recoveries; ret = snd_pcm_mmap(spcm); if (ret < 0) { --- a/src/pcm/pcm_direct.h +++ b/src/pcm/pcm_direct.h @@ -66,7 +66,6 @@ typedef struct { char socket_name[256]; /* name of communication socket */ snd_pcm_type_t type; /* PCM type (currently only hw) */ int use_server; - unsigned int recoveries; /* no of executed recoveries on slave*/ struct { unsigned int format; snd_interval_t rate; @@ -95,7 +94,7 @@ typedef struct { unsigned int stop_threshold; unsigned int silence_threshold; unsigned int silence_size; - unsigned int xfer_align; /* not used */ + unsigned int recoveries; /* no of executed recoveries on slave*/ unsigned long long boundary; unsigned int info; unsigned int msbits;

2 1

[alsa-devel] [PATCH 0/3] ALSA: Add rewind disable support
by Subhransu S. Prusty 26 May '17

26 May '17

Rewinds can be disabled when data written in ring buffer will never be validated. This allows for new HDaudio SPIB DMA functionality(allow fetch up to the application pointer, no rewind supported). Skylake driver changes using SPIB will be posted once the core changes are merged. Based on discussion on community, .ack callback is extended with new attribute argument, to allow fetch up to the application pointer. Also drop the mmap of status and control if SPIB functionality is reported by driver. There may be some slight performance downside, but it's likely very small. Verified the changes with tinyalsa and alsa-lib, with both mmap and without mmap support and it works fine. Pierre-Louis Bossart (3): ALSA: core: let low-level driver or userspace disable rewinds ALSA: core: modify .ack callback to take arguments for updating appl ptr ALSA: pcm: conditionally avoid mmap of control data include/sound/pcm-indirect.h | 4 ++-- include/sound/pcm.h | 9 +++++++- include/uapi/sound/asound.h | 2 ++ sound/core/pcm_lib.c | 6 ++++-- sound/core/pcm_native.c | 49 ++++++++++++++++++++++++++++++++++++++++++- sound/mips/hal2.c | 14 ++++++++++--- sound/pci/cs46xx/cs46xx_lib.c | 18 ++++++++++++---- sound/pci/emu10k1/emupcm.c | 8 +++++-- sound/pci/rme32.c | 15 ++++++++++--- 9 files changed, 107 insertions(+), 18 deletions(-) -- 1.9.1

5 30

[alsa-devel] Problems with the DP MST audio support patchset
by Pascal Wichmann 26 May '17

26 May '17

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hello, I am not sure whether alsa-devel is the right place for this kind of question. If it is not, please tell me a better place for them. I am building my kernel against the drm-tip freedesktop repository which includes the patches from December 2016 (message id <1480992519-108079-1-git-send-email-libin.yang(a)intel.com> and follow-ups on alsa-devel). I am using a ThinkPad X250 and the ThinkPad Ultra Dock with the HDMI output connected to my YAMAHA HTR-2866; this hdmi output is seen as display port and uses DP MST from the dock. In principle, everything is working quite well; however, I frequently recognize two weird behaviours: * First of all, my audio receiver has 5.1 support. When I configure my laptop to send 5.1 audio using alsa or pulseaudio, there is only silence and no audio signal reaches the receiver; however, when I choose 7.1 digital surround (which my receiver actually does not suppo rt natively), everything works well and the two additional speakers are split to the existing ones (I do not know whether alsa/the kernel or the receiver does this, probably it is the receiver). This problem is pretty much only esthetical, as everything works fine if I use the 7.1 "work-around" (Digital Stereo does work also, but obviously does not support the full 5.1 setup) * The other problem -- which is actually very annoying -- is that there frequently is silence though there is audio playing; this happens now and then, but when there has been *no* output for a while, it always happens a few seconds after starting the new output and lasts for two to three seconds. During these periods of silence, the icons on my receiver indicating that there is an audio source are also gone. This problem occurs with 7.1 configuration as well as with Digital Stereo. I am not sure what these problems are caused by and do not know what kin d of debug information you may require to get more hints on how to solve them. Any hints are appreciated. Thank you for your advice, Pascal Wichmann -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEE/gJ8Tpn0OtJz8hxD6+YIa34W/zYFAljbj5cACgkQ6+YIa34W /zbIVg//QP4A0wUE2MyaEAenN8nUpNV5ASglRTZ0N5hXBjD+B/sxIMkJdtSynlcB eBYL90ZLuFHxdfXsltifeY29D7CaHfyqQCeJUfzV+RgUGrlv0wqk2vA9Dfc+RTIT PBORlyuknqIV14z8vxMGO/1+Po/S8AFplK/QJs9Y+irGAX+CAhBMlVMt8V5rbL+e oD8KRWgPIwuYShhd0f3tmgqdhRn9RUQgBaYOaq1pXdI/nNDHZuRA021zytkkV4rR NGG2zOsgrrXo82ac1AAeUXlNczqUCM7UXNLjpVYUQQotEMZd9d6oL5/Iq/bD7Z8i Z+bzOWymzaaThqarc11UL9ngJr6JsDNXgdDrLgLbkSE1r6Knq66qzOmzZL7qeUDI 1JeCNkmztn82VLovRogQTY8p8Ye7gXwVUPNDocCoeBKgRA6u2VGs+zJljCDOiyT9 cCA+QGMpRMz+KLt82Bt5/vE6TzngUEOZli34wNhf6DaHYo+0j4TpiCZT3roIVlp+ C+tPvDsbt9SfVLKvmoDCKAS8o5wp7+jESAsTEMzssBeN6LYKTWeAJeZHymf17ckb Y3oub8Wk5bEvZh0AO5q7wqdWMLuTc9BSmJ8eJA0jNV+m9sGKxaTB/qFMfNoJjfFD yvBBeYvic0btTtOiQAPEia1igNR9vt1hpj5wCI6xNQwSekM1bOQ= =/6Dp -----END PGP SIGNATURE-----

4 13

[alsa-devel] [PATCH 0/7] ALSA: Fix/improve PCM ack callback
by Takashi Iwai 25 May '17

25 May '17

Hi, this is a series of patches to fix the potential bugs in PCM ack callback using the pcm-indirect helper functions, and also to enhance the ack callback to be called properly in all appl_ptr updates, as similarly done by Pierre and Subhransu's patches. The changes in the pcm-indirect helper code and its users are fairly trivial, just passing the error code back. ARM/R-Pi people are Cc'ed because of bcm2835-audio driver. Takashi === Takashi Iwai (7): ALSA: pcm: Fix negative appl_ptr handling in pcm-indirect helpers ALSA: mips: Deliver indirect-PCM transfer error ALSA: cs46xx: Deliver indirect-PCM transfer error ALSA: emu10k1: Deliver indirect-PCM transfer error ALSA: rme32: Deliver indirect-PCM transfer error staging: bcm2835-audio: Deliver indirect-PCM transfer error ALSA: pcm: Call ack() whenever appl_ptr is updated .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 5 +-- include/sound/pcm-indirect.h | 10 ++++- sound/core/pcm_native.c | 46 +++++++++++++++++----- sound/mips/hal2.c | 14 +++---- sound/pci/cs46xx/cs46xx_lib.c | 8 ++-- sound/pci/emu10k1/emupcm.c | 4 +- sound/pci/rme32.c | 10 ++--- 7 files changed, 63 insertions(+), 34 deletions(-) -- 2.13.0

3 14

[alsa-devel] 1.1.4 bug report: dmix fails when using both 32-bit and 64-bit clients
by Cheng Sun 25 May '17

25 May '17

Hi all, The following commit (released in v1.1.4) introduced an issue where a client compiled against a 32-bit (x86) compile of alsa-lib cannot use the same dmix as a client compiled against a 64-bit alsa-lib. 1a9bd0f0448106b917ae7f7bedccfcbf6ce84802 The error message is: ALSA lib pcm_dmix.c:1077:(snd_pcm_dmix_open) unable to create IPC shm instance The following forum post (not mine) describes the symptoms of the issue in more detail (although the git commit the poster specified is not correct): https://forums.gentoo.org/viewtopic-p-8072290.html?sid=c2fbca45102933ddf9ca… Cheers, Cheng

2 7

[alsa-devel] [PATCH RFC 00/11] ALSA: pcm: introduce copy_frame operation and SND_PCM_PROXY_DRIVER_SUPPORT
by Takashi Sakamoto 25 May '17

25 May '17

Hi, This RFC patchset is my concept work of another solution against a series of issues in ALSA PCM core, for which Iwai Takashi work in his hasty proposals[2][3]. Included changes are also available in my personal repository on github.com[4]. The aim of this work is to declare existent issues and to propose solutions as moderated as possible. Code refactoring is done to assist it. Patch 01-05: code refactoring phase, with an alias of function prototype. Patch 06-09: driver API changing phase. The .copy_frames is introduced. Patch 10-11: integration phase for proxy drivers, to get new configuration. I need to do this work with a little time (half a day), thus changes are as minimal as possible, especially two drivers are just modified even if drivers in below list should be changed: * drivers/media/pci/solo6x10/solo6x10-g723.c * sound/drivers/dummy.c * sound/isa/gus/gus_pcm.c * sound/isa/sb/emu8000_pcm.c * sound/pci/es1938.c * sound/pci/korg1212/korg1212.c * sound/pci/nm256/nm256.c * sound/pci/rme32.c * sound/pci/rme96.c * sound/pci/rme9652/hdsp.c * sound/pci/rme9652/rme9652.c * sound/sh/sh_dac_audio.c * sound/soc/blackfin/bf5xx-ac97-pcm.c * sound/soc/blackfin/bf5xx-i2s-pcm.c Furthermore, I apologize that this is untested. I wish you to check the concept. [1] [alsa-devel] [PATCH RFC 00/26] Kill set_fs() in ALSA codes http://mailman.alsa-project.org/pipermail/alsa-devel/2017-May/120542 [2] [alsa-devel] [PATCH 00/16] ALSA: Convert to new copy_silence PCM ops http://mailman.alsa-project.org/pipermail/alsa-devel/2017-May/120895.html [3] [alsa-devel] [PATCH 0/4] ALSA: Extend PCM buffer-copy helpers http://mailman.alsa-project.org/pipermail/alsa-devel/2017-May/120957.html [4] takaswie/sound https://github.com/takaswie/sound/tree/topic/add-pcm-frame-ops Takashi Sakamoto (11): ALSA: pcm: introduce an alias of prototype to copy PCM frames ALSA: pcm: use new function alias instead of local one ALSA: pcm: refactoring silence operation ALSA: pcm: add alternative calls ALSA: core: remove duplicated codes to handle PCM frames ALSA: pcm: add new operation; copy_frames ALSA: rme9652: a sample for drivers which support interleaved buffer ALSA: gus: a sample for drivers which support non-interleaved buffer ALSA: pcm: remove copy and silence callbacks ALSA: pcm: add client_space parameter to runtime of PCM substream for PCM proxy drivers ALSA: pcm: add new configuration for PCM proxy drivers drivers/usb/gadget/Kconfig | 3 +- include/sound/pcm.h | 13 +- sound/core/Kconfig | 15 +- sound/core/pcm_lib.c | 448 +++++++++++++++++++++++++++++---------------- sound/core/pcm_native.c | 10 + sound/isa/gus/gus_pcm.c | 100 +++++----- sound/pci/rme9652/hdsp.c | 59 +++--- 7 files changed, 398 insertions(+), 250 deletions(-) -- 2.11.0

2 15