June 2020 - Alsa-devel - mailman.alsa-project.org

[PATCH] ASoC: fsl_mqs: Fix unchecked return value for clk_prepare_enable
by Shengjiu Wang 22 Jun '20

22 Jun '20

Fix unchecked return value for clk_prepare_enable. And because clk_prepare_enable and clk_disable_unprepare should check input clock parameter is NULL or not, then we don't need to check it before calling the function. Fixes: 9e28f6532c61 ("ASoC: fsl_mqs: Add MQS component driver") Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- sound/soc/fsl/fsl_mqs.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/sound/soc/fsl/fsl_mqs.c b/sound/soc/fsl/fsl_mqs.c index 0c813a45bba7..69aeb0e71844 100644 --- a/sound/soc/fsl/fsl_mqs.c +++ b/sound/soc/fsl/fsl_mqs.c @@ -265,12 +265,20 @@ static int fsl_mqs_remove(struct platform_device *pdev) static int fsl_mqs_runtime_resume(struct device *dev) { struct fsl_mqs *mqs_priv = dev_get_drvdata(dev); + int ret; - if (mqs_priv->ipg) - clk_prepare_enable(mqs_priv->ipg); + ret = clk_prepare_enable(mqs_priv->ipg); + if (ret) { + dev_err(dev, "failed to enable ipg clock\n"); + return ret; + } - if (mqs_priv->mclk) - clk_prepare_enable(mqs_priv->mclk); + ret = clk_prepare_enable(mqs_priv->mclk); + if (ret) { + dev_err(dev, "failed to enable mclk clock\n"); + clk_disable_unprepare(mqs_priv->ipg); + return ret; + } if (mqs_priv->use_gpr) regmap_write(mqs_priv->regmap, IOMUXC_GPR2, @@ -292,11 +300,8 @@ static int fsl_mqs_runtime_suspend(struct device *dev) regmap_read(mqs_priv->regmap, REG_MQS_CTRL, &mqs_priv->reg_mqs_ctrl); - if (mqs_priv->mclk) - clk_disable_unprepare(mqs_priv->mclk); - - if (mqs_priv->ipg) - clk_disable_unprepare(mqs_priv->ipg); + clk_disable_unprepare(mqs_priv->mclk); + clk_disable_unprepare(mqs_priv->ipg); return 0; } -- 2.21.0

1 0

alsa-gobject: reorder documentation sections
by GitHub pull_request - opened 21 Jun '20

21 Jun '20

alsa-project/alsa-gobject pull request #45 was opened from takaswie: For better documentation, this patchset reorders sections of ALSATimer/ALSASeq documentation. Request URL : https://github.com/alsa-project/alsa-gobject/pull/45 Patch URL : https://github.com/alsa-project/alsa-gobject/pull/45.patch Repository URL: https://github.com/alsa-project/alsa-gobject

1 0

alsa-gobject: add API to get current protocol version in each interface
by GitHub pull_request - opened 21 Jun '20

21 Jun '20

alsa-project/alsa-gobject pull request #44 was opened from takaswie: In UAPI of Linux sound subsystem, interfaces support protocol versioning. This patchset adds API to get current protocol version in each interface. Request URL : https://github.com/alsa-project/alsa-gobject/pull/44 Patch URL : https://github.com/alsa-project/alsa-gobject/pull/44.patch Repository URL: https://github.com/alsa-project/alsa-gobject

1 0

alsa-gobject: fix indentation
by GitHub pull_request - opened 21 Jun '20

21 Jun '20

alsa-project/alsa-gobject pull request #43 was opened from takaswie: This patchset is trivial to apply fixes for 4-spaces indentation. Request URL : https://github.com/alsa-project/alsa-gobject/pull/43 Patch URL : https://github.com/alsa-project/alsa-gobject/pull/43.patch Repository URL: https://github.com/alsa-project/alsa-gobject

1 0

[Resend PATCH] Add implicit feedback quirk for SSL2.
by Laurence Tratt 21 Jun '20

21 Jun '20

As expected, this requires the same quirk as the SSL2+ in order for the clock to sync. This was suggested by, and tested on an SSL2, by Dmitry. Suggested-by: Dmitry <dpavlushko(a)gmail.com> Signed-off-by: Laurence Tratt <laurie(a)tratt.net> --- sound/usb/pcm.c | 1 + 1 file changed, 1 insertion(+) diff --git sound/usb/pcm.c sound/usb/pcm.c index 84c0ae4319..dc1608bdf6 100644 --- sound/usb/pcm.c +++ sound/usb/pcm.c @@ -367,6 +367,7 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs, ifnum = 0; goto add_sync_ep_from_ifnum; case USB_ID(0x07fd, 0x0008): /* MOTU M Series */ + case USB_ID(0x31e9, 0x0001): /* Solid State Logic SSL2 */ case USB_ID(0x31e9, 0x0002): /* Solid State Logic SSL2+ */ ep = 0x81; ifnum = 2; -- 2.27.0

1 0

[HDAudio][ALC295] speakers not working on Acer Travelmate P614
by Stanislav Kazmin 21 Jun '20

21 Jun '20

Hello, I have the following problem on my Acer TravelMate P614-51T-G2: I have all the audio sinks correctly identified (like HDMI, DMic, Headphones) but the internal speakers do not produce any sound. What I have tried so far: - hard/soft shutdown on Windows and reboot - disable/re-enable speakers and microphone in BIOS - uninstall pulseaudio and test alsa alone (so it is defeitely **not** a pulseaudio issue) - switch from sof-hda-dsp to snd-hda-intel driver (without Dmic support) - retask pins 0x14, 0x16, 0x1b to "Internal Speakers" through hdajackretask (only basic, without advanced features) - removed/reconnected the headphones `alsamixer` shows all needed sinks and nothing is muted. I already discussed the issue at sof github https://github.com/thesofproject/ sof/issues/3058 but since the same issue occurs on `snd-hda-intel` legacy river, I was advised to communicate with alsa-devel team. The alsa-info.sh result are linked at http://alsa-project.org/db/? f=252f92c7a1df3c755d16ee69353b26d2535a4d81 I have tested the kernel 5.8-rc1 but it does not make any difference. Let me know if I can do anything else to test the issue.

1 0

Lock-free dmix considered harmful
by Maarten Baert 20 Jun '20

20 Jun '20

I'm in the process of adding monitoring support to dmix (i.e. the ability for applications to capture the sound being played back through the speakers) - expect patches for this soon. However while reading the dmix source code I came across something weird. Dmix uses a lock-free mixing implementation based on (architecture-dependent) atomic operations such as atomic addition and compare-exchange. However at the same time dmix also uses a semaphore to prevent multiple processes from accessing the shared memory buffers simultaneously. This is redundant and makes the lock-free implementation rather pointless. Out of curiosity I decided to measure the time it takes to execute snd_pcm_dmix_sync_area for these three cases: - A simple locked implementation, which acquires the semaphore and then does mixing using the non-concurrent code from pcm_dmix_generic.c. - The current (redundant) implementation, which acquires the semaphore and then does atomic mixing. - A lock-free implementation, which does not acquire the semaphore and does atomic mixing. The resulting sound is identical in all three cases. (As a sanity check I also tested the 4th case, non-concurrent code without locking, which as expected produces audio with glitches.) I tested each case with 1, 4 and 20 simultaneous playback streams (multiple instances of 'aplay') on a system with 4 physical CPU cores (Intel Core i7-4770). You can see the results here: https://misc.maartenbaert.be/dmix_perf_locked_atomic.png The results are quite surprising: - The locked implementation is 3 to 6 times *faster* than the current redundant implementation. - The lock-free implementation is usually about as fast as the current redundant implementation, but has extreme outliers that are up to 3 times *slower* than the redundant implementation when there are multiple threads. It seems that the overhead of the atomic operations is so high that it completely negates the theoretical advantage of being able to mix from multiple threads simultaneously. This may be the result of 'false sharing' when multiple threads are accessing different words in the same cache line (which is almost impossible to avoid when mixing audio). On a related note, I believe that I have also found a bug in the lock-free implementation. The logic which is used to clear the 'sum' buffer is as follows: sample = *src; old_sample = *sum; if (ARCH_CMPXCHG(dst, 0, 1) == 0) sample -= old_sample; ARCH_ADD(sum, sample); This takes advantage of the fact that the hardware driver clears the playback buffer after reading it. However it does not account for the possibility that 'dst' might be zero for other reasons, such as: - An application plays back silence. - An application plays back sound, but then rewinds it. - Multiple applications play back sound which just happens to sum to zero occasionally. These all result in situations where 'dst' is changed from 0 to 1 by the compare-exchange operation, but then changed back to zero later, resulting in the classic 'ABA problem'. However this problem is currently hidden by the fact that the lock-free implementation is in fact still locked. Because of these reasons I think it would be better to drop the lock-free implementation entirely and just use the existing non-concurrent architecture-independent implementation from pcm_dmix_generic.c. Aside from being faster, it would also eliminate a lot of architecture-dependent code and inline assembly. Should I submit a patch for this? Best regards, Maarten Baert

3 5

[PATCH] snd-usb-audio: add quirk for MacroSilicon MS2109
by Hector Martin 20 Jun '20

20 Jun '20

These devices claim to be 96kHz mono, but actually are 48kHz stereo with swapped channels and unaligned transfers. Signed-off-by: Hector Martin <marcan(a)marcan.st> Cc: stable(a)vger.kernel.org --- sound/usb/quirks-table.h | 52 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 4ec491011b19..9092cc0aa807 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -3633,4 +3633,56 @@ ALC1220_VB_DESKTOP(0x26ce, 0x0a01), /* Asrock TRX40 Creator */ } }, +/* + * MacroSilicon MS2109 based HDMI capture cards + * + * These claim 96kHz 1ch in the descriptors, but are actually 48kHz 2ch. + * They also need QUIRK_AUDIO_ALIGN_TRANSFER, which makes one wonder if + * they pretend to be 96kHz mono as a workaround for stereo being broken + * by that... + * + * They also have swapped L-R channels, but that's for userspace to deal + * with. + */ +{ + USB_DEVICE(0x534d, 0x2109), + .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { + .vendor_name = "MacroSilicon", + .product_name = "MS2109", + .ifnum = QUIRK_ANY_INTERFACE, + .type = QUIRK_COMPOSITE, + .data = &(const struct snd_usb_audio_quirk[]) { + { + .ifnum = 2, + .type = QUIRK_AUDIO_ALIGN_TRANSFER, + }, + { + .ifnum = 2, + .type = QUIRK_AUDIO_STANDARD_MIXER, + }, + { + .ifnum = 3, + .type = QUIRK_AUDIO_FIXED_ENDPOINT, + .data = &(const struct audioformat) { + .formats = SNDRV_PCM_FMTBIT_S16_LE, + .channels = 2, + .iface = 3, + .altsetting = 1, + .altset_idx = 1, + .attributes = 0, + .endpoint = 0x82, + .ep_attr = USB_ENDPOINT_XFER_ISOC | + USB_ENDPOINT_SYNC_ASYNC, + .rates = SNDRV_PCM_RATE_CONTINUOUS, + .rate_min = 48000, + .rate_max = 48000, + } + }, + { + .ifnum = -1 + } + } + } +}, + #undef USB_DEVICE_VENDOR_SPEC -- 2.27.0

1 0

How to populate required string as audio endpoint name in gnome audio devices tab
by Mukunda,Vijendar 20 Jun '20

20 Jun '20

Renoir platform has onboard dmic + south bridge HD Audio endpoint support. For onboard Dmic, Audio endpoint name is populated as "Analog Input" in Audio input devices. How can we populate name as "Internal Mic" or "Dmic" in audio input devices tab in sound settings? Alsa info link: https://pastebin.ubuntu.com/p/4kprhDZYbg/ Pluse audio info output: https://pastebin.ubuntu.com/p/sdx9Xs234C/ Thanks, Vijendar

3 3

Re: [PATCH 2/2] ASoC: qcom: add apq8039 sound card support
by kernel test robot 20 Jun '20

20 Jun '20

Hi Pantelis, I love your patch! Perhaps something to improve: [auto build test WARNING on asoc/for-next] [also build test WARNING on sound/for-next v5.8-rc1 next-20200618] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use as documented in https://git-scm.com/docs/git-format-patch] url: https://github.com/0day-ci/linux/commits/Pantelis-Antoniou/ASoC-qcom-add-ap… base: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next config: i386-allyesconfig (attached as .config) compiler: gcc-9 (Debian 9.3.0-13) 9.3.0 reproduce (this is a W=1 build): # save the attached .config to linux build tree make W=1 ARCH=i386 If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot <lkp(a)intel.com> All warnings (new ones prefixed by >>, old ones prefixed by <<): In file included from arch/x86/include/asm/page_32.h:35, from arch/x86/include/asm/page.h:14, from arch/x86/include/asm/thread_info.h:12, from include/linux/thread_info.h:38, from arch/x86/include/asm/preempt.h:7, from include/linux/preempt.h:78, from include/linux/rcupdate.h:27, from include/linux/rculist.h:11, from include/linux/pid.h:5, from include/linux/sched.h:14, from include/linux/ratelimit.h:6, from include/linux/dev_printk.h:16, from include/linux/device.h:15, from sound/soc/qcom/apq8039.c:5: In function 'strncpy', inlined from 'snd_soc_card_ctl_getset.constprop' at sound/soc/qcom/apq8039.c:176:5: >> include/linux/string.h:297:30: warning: '__builtin_strncpy' destination unchanged after copying no bytes [-Wstringop-truncation] 297 | #define __underlying_strncpy __builtin_strncpy | ^ include/linux/string.h:307:9: note: in expansion of macro '__underlying_strncpy' 307 | return __underlying_strncpy(p, q, size); | ^~~~~~~~~~~~~~~~~~~~ vim +/__builtin_strncpy +297 include/linux/string.h 47227d27e2fcb0 Daniel Axtens 2020-06-03 275 47227d27e2fcb0 Daniel Axtens 2020-06-03 276 #ifdef CONFIG_KASAN 47227d27e2fcb0 Daniel Axtens 2020-06-03 277 extern void *__underlying_memchr(const void *p, int c, __kernel_size_t size) __RENAME(memchr); 47227d27e2fcb0 Daniel Axtens 2020-06-03 278 extern int __underlying_memcmp(const void *p, const void *q, __kernel_size_t size) __RENAME(memcmp); 47227d27e2fcb0 Daniel Axtens 2020-06-03 279 extern void *__underlying_memcpy(void *p, const void *q, __kernel_size_t size) __RENAME(memcpy); 47227d27e2fcb0 Daniel Axtens 2020-06-03 280 extern void *__underlying_memmove(void *p, const void *q, __kernel_size_t size) __RENAME(memmove); 47227d27e2fcb0 Daniel Axtens 2020-06-03 281 extern void *__underlying_memset(void *p, int c, __kernel_size_t size) __RENAME(memset); 47227d27e2fcb0 Daniel Axtens 2020-06-03 282 extern char *__underlying_strcat(char *p, const char *q) __RENAME(strcat); 47227d27e2fcb0 Daniel Axtens 2020-06-03 283 extern char *__underlying_strcpy(char *p, const char *q) __RENAME(strcpy); 47227d27e2fcb0 Daniel Axtens 2020-06-03 284 extern __kernel_size_t __underlying_strlen(const char *p) __RENAME(strlen); 47227d27e2fcb0 Daniel Axtens 2020-06-03 285 extern char *__underlying_strncat(char *p, const char *q, __kernel_size_t count) __RENAME(strncat); 47227d27e2fcb0 Daniel Axtens 2020-06-03 286 extern char *__underlying_strncpy(char *p, const char *q, __kernel_size_t size) __RENAME(strncpy); 47227d27e2fcb0 Daniel Axtens 2020-06-03 287 #else 47227d27e2fcb0 Daniel Axtens 2020-06-03 288 #define __underlying_memchr __builtin_memchr 47227d27e2fcb0 Daniel Axtens 2020-06-03 289 #define __underlying_memcmp __builtin_memcmp 47227d27e2fcb0 Daniel Axtens 2020-06-03 290 #define __underlying_memcpy __builtin_memcpy 47227d27e2fcb0 Daniel Axtens 2020-06-03 291 #define __underlying_memmove __builtin_memmove 47227d27e2fcb0 Daniel Axtens 2020-06-03 292 #define __underlying_memset __builtin_memset 47227d27e2fcb0 Daniel Axtens 2020-06-03 293 #define __underlying_strcat __builtin_strcat 47227d27e2fcb0 Daniel Axtens 2020-06-03 294 #define __underlying_strcpy __builtin_strcpy 47227d27e2fcb0 Daniel Axtens 2020-06-03 295 #define __underlying_strlen __builtin_strlen 47227d27e2fcb0 Daniel Axtens 2020-06-03 296 #define __underlying_strncat __builtin_strncat 47227d27e2fcb0 Daniel Axtens 2020-06-03 @297 #define __underlying_strncpy __builtin_strncpy 47227d27e2fcb0 Daniel Axtens 2020-06-03 298 #endif 47227d27e2fcb0 Daniel Axtens 2020-06-03 299 --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org

1 0