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

[alsa-devel] [PATCH] ALSA: usb-audio: Add boot quirk for MOTU M Series
by Alexander Tsoy 12 Jan '20

12 Jan '20

Add delay to make sure that audio urbs are not sent too early. Otherwise the device hangs. Windows driver makes ~2s delay, so use about the same time delay value. snd_usb_apply_boot_quirk() is called 3 times for my MOTU M4, which is an overkill. Thus a quirk that is called only once is implemented. Also send two vendor-specific control messages before and after the delay. This behaviour is blindly copied from the Windows driver. Signed-off-by: Alexander Tsoy <alexander(a)tsoy.me> --- sound/usb/card.c | 4 ++++ sound/usb/quirks.c | 38 ++++++++++++++++++++++++++++++++++++++ sound/usb/quirks.h | 5 +++++ 3 files changed, 47 insertions(+) diff --git a/sound/usb/card.c b/sound/usb/card.c index 9f743ebae615..2f582ac7cf78 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -600,6 +600,10 @@ static int usb_audio_probe(struct usb_interface *intf, } } if (! chip) { + err = snd_usb_apply_boot_quirk_once(dev, intf, quirk, id); + if (err < 0) + return err; + /* it's a fresh one. * now look for an empty slot and create a new card instance */ diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 82184036437b..c93c53126243 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1113,6 +1113,31 @@ static int snd_usb_motu_microbookii_boot_quirk(struct usb_device *dev) return err; } +static int snd_usb_motu_m_series_boot_quirk(struct usb_device *dev) +{ + int ret; + + if (snd_usb_pipe_sanity_check(dev, usb_sndctrlpipe(dev, 0))) + return -EINVAL; + ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0), + 1, USB_TYPE_VENDOR | USB_RECIP_DEVICE, + 0x0, 0, NULL, 0, 1000); + + if (ret < 0) + return ret; + + msleep(2000); + + ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0), + 1, USB_TYPE_VENDOR | USB_RECIP_DEVICE, + 0x20, 0, NULL, 0, 1000); + + if (ret < 0) + return ret; + + return 0; +} + /* * Setup quirks */ @@ -1297,6 +1322,19 @@ int snd_usb_apply_boot_quirk(struct usb_device *dev, return 0; } +int snd_usb_apply_boot_quirk_once(struct usb_device *dev, + struct usb_interface *intf, + const struct snd_usb_audio_quirk *quirk, + unsigned int id) +{ + switch (id) { + case USB_ID(0x07fd, 0x0008): /* MOTU M Series */ + return snd_usb_motu_m_series_boot_quirk(dev); + } + + return 0; +} + /* * check if the device uses big-endian samples */ diff --git a/sound/usb/quirks.h b/sound/usb/quirks.h index a80e0ddd0736..fa83a98ad7bb 100644 --- a/sound/usb/quirks.h +++ b/sound/usb/quirks.h @@ -20,6 +20,11 @@ int snd_usb_apply_boot_quirk(struct usb_device *dev, const struct snd_usb_audio_quirk *quirk, unsigned int usb_id); +int snd_usb_apply_boot_quirk_once(struct usb_device *dev, + struct usb_interface *intf, + const struct snd_usb_audio_quirk *quirk, + unsigned int usb_id); + void snd_usb_set_format_quirk(struct snd_usb_substream *subs, struct audioformat *fmt); -- 2.24.1

2 1

[alsa-devel] [PATCH 0/2] ALSA: fix compiler warnings
by Pierre-Louis Bossart 12 Jan '20

12 Jan '20

2 additional issues reported by GCC W=1. the first one looks like a bug, the second one more of a style issue. Fixes for ASoC will be provided separately after review/test. Pierre-Louis Bossart (2): ALSA: HDA: patch_realtek: fix empty macro usage in if block ALSA: usb: update old-style static const declaration sound/pci/hda/patch_realtek.c | 4 ++-- sound/usb/mixer_quirks.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.20.1

2 4

[alsa-devel] [PATCH] ALSA: timer: fix nsec/sec initialization confusion
by Pierre-Louis Bossart 12 Jan '20

12 Jan '20

GCC reports a warning with W=1: sound/core/timer.c: In function ‘snd_timer_user_read’: sound/core/timer.c:2219:19: warning: initialized field overwritten [-Woverride-init] 2219 | .tstamp_sec = tread->tstamp_nsec, | ^~~~~ sound/core/timer.c:2219:19: note: (near initialization for ‘(anonymous).tstamp_sec’) Assigning nsec values to sec fields is problematic in general, even more so when the initial goal was to survive the 2030 timer armageddon. Fix by using the proper field in the initialization Cc: Baolin Wang <baolin.wang(a)linaro.org> Cc: Arnd Bergmann <arnd(a)arndb.de> Fixes: 07094ae6f9527 ("ALSA: Avoid using timespec for struct snd_timer_tread") Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/core/timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/core/timer.c b/sound/core/timer.c index 8835ff91a893..d9f85f2d66a3 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -2216,7 +2216,7 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer, tread32 = (struct snd_timer_tread32) { .event = tread->event, .tstamp_sec = tread->tstamp_sec, - .tstamp_sec = tread->tstamp_nsec, + .tstamp_nsec = tread->tstamp_nsec, .val = tread->val, }; -- 2.20.1

3 2

[alsa-devel] alsa-gobject: ctl: fix wrong operation for values in enumerated type of element
by GitHub pull_request - opened 12 Jan '20

12 Jan '20

alsa-project/alsa-gobject pull request #4 was opened from takaswie: The 'snd_ctl_elem_value' structure includes union member for values. Although it includes 'enumerated' member for values in enumerated type of element, current implementation of alsactl library uses 'integer' member to pick up the values. As a result, in any 64 bit System V ABI, the library fails to get/set values for the enumerated type of element. This commit fixes the bug. Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> Request URL : https://github.com/alsa-project/alsa-gobject/pull/4 Patch URL : https://github.com/alsa-project/alsa-gobject/pull/4.patch Repository URL: https://github.com/alsa-project/alsa-gobject

1 0

[alsa-devel] When storing settings which contain a [ or ], the setting is not quoted.
by GitHub issues - edited 10 Jan '20

10 Jan '20

alsa-project/alsa-lib issue #22 was edited from Bertware: I am using a Raspberry Pi 1 B+ with a Hifiberry DAC+ADC Pro HAT. This HAT contains a PCM5122 Stereo DAC and an ADC. Now to the issue: The ADC has parameters such as `VINR1[SE]` and `VINR2[SE] + VINR1[SE]`. When using `alsactl store` or`alsactl restore`, restoring will fail due to an invalid file. `ALSA lib conf.c:1887:(_snd_config_load_with_include) _toplevel_:354:30:Unexpected char` This error points to the parameter `VINR1[SE]`, which is not surrounded by quotes. The other parameters, which also contain other special characters such as spaces, are surrounded by quotes. An excerpt of the file is included below. This clearly illustrates which names were encapsulated between quotes. ``` control.28 { iface MIXER name 'ADC Right Capture Source' value VINR1[SE] comment { access 'read write' type ENUMERATED count 1 item.0 'No Select' item.1 VINR1[SE] item.2 VINR2[SE] item.3 'VINR2[SE] + VINR1[SE]' item.4 VINR3[SE] item.5 'VINR3[SE] + VINR1[SE]' item.6 'VINR3[SE] + VINR2[SE]' item.7 'VINR3[SE] + VINR2[SE] + VINR1[SE]' item.8 VINR4[SE] item.9 'VINR4[SE] + VINR1[SE]' item.10 'VINR4[SE] + VINR2[SE]' item.11 'VINR4[SE] + VINR2[SE] + VINR1[SE]' item.12 'VINR4[SE] + VINR3[SE]' item.13 'VINR4[SE] + VINR3[SE] + VINR1[SE]' item.14 'VINR4[SE] + VINR3[SE] + VINR2[SE]' item.15 'VINR4[SE] + VINR3[SE] + VINR2[SE] + VINR1[SE]' item.16 '{VIN2P, VIN2M}[DIFF]' item.17 '{VIN3P, VIN3M}[DIFF]' item.18 '{VIN2P, VIN2M}[DIFF] + {VIN3P, VIN3M}[DIFF]' } } ``` Manually fixing this file by adding '' around the items which miss quotes fixes the issue, and allows restoring it. **How this leads to alsa-lib and where the issue is located** Creation of the output data and writing it to a file is handled by the save_state method in alsactl: https://github.com/alsa-project/alsa-utils/blob/master/alsactl/state.c#L1539 This code in turn calls snd_config_save in the alsa-lib project: https://github.com/alsa-project/alsa-lib/blob/b20b400e2f598c86abaf697d66396… Then further to string_print: https://github.com/alsa-project/alsa-lib/blob/b20b400e2f598c86abaf697d66396… And then in this loop which decides which characters need to be quoted: https://github.com/alsa-project/alsa-lib/blob/b20b400e2f598c86abaf697d66396… **Proposed solution** The characters `[` and `]` should be a reason to put text between quotes. These characters should be added to the switch statement in print_string here: https://github.com/alsa-project/alsa-lib/blob/b20b400e2f598c86abaf697d66396… Regards, Bert Issue URL : https://github.com/alsa-project/alsa-lib/issues/22 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[alsa-devel] When storing settings which contain a [ or ], the setting is not quoted.
by GitHub issues - edited 10 Jan '20

10 Jan '20

alsa-project/alsa-lib issue #22 was edited from Bertware: I am using a Raspberry Pi 1 B+ with a Hifiberry DAC+ADC Pro HAT. This HAT contains a PCM5122 Stereo DAC and an ADC. Now to the issue: The ADC has parameters such as `VINR1[SE]` and `VINR2[SE] + VINR1[SE]`. When using `alsactl store` or`alsactl restore`, restoring will fail due to an invalid file. `ALSA lib conf.c:1887:(_snd_config_load_with_include) _toplevel_:354:30:Unexpected char` This error points to the parameter `VINR1[SE]`, which is not surrounded by quotes. The other parameters, which also contain other special characters such as spaces, are surrounded by quotes. An excerpt of the file is included below. This clearly illustrates which names were encapsulated between quotes. ``` control.28 { iface MIXER name 'ADC Right Capture Source' value VINR1[SE] comment { access 'read write' type ENUMERATED count 1 item.0 'No Select' item.1 VINR1[SE] item.2 VINR2[SE] item.3 'VINR2[SE] + VINR1[SE]' item.4 VINR3[SE] item.5 'VINR3[SE] + VINR1[SE]' item.6 'VINR3[SE] + VINR2[SE]' item.7 'VINR3[SE] + VINR2[SE] + VINR1[SE]' item.8 VINR4[SE] item.9 'VINR4[SE] + VINR1[SE]' item.10 'VINR4[SE] + VINR2[SE]' item.11 'VINR4[SE] + VINR2[SE] + VINR1[SE]' item.12 'VINR4[SE] + VINR3[SE]' item.13 'VINR4[SE] + VINR3[SE] + VINR1[SE]' item.14 'VINR4[SE] + VINR3[SE] + VINR2[SE]' item.15 'VINR4[SE] + VINR3[SE] + VINR2[SE] + VINR1[SE]' item.16 '{VIN2P, VIN2M}[DIFF]' item.17 '{VIN3P, VIN3M}[DIFF]' item.18 '{VIN2P, VIN2M}[DIFF] + {VIN3P, VIN3M}[DIFF]' } } ``` Creation of the output data and writing it to a file is handled by the save_state method in alsactl: https://github.com/alsa-project/alsa-utils/blob/master/alsactl/state.c#L1539 This code in turn calls snd_config_save in the alsa-lib project: https://github.com/alsa-project/alsa-lib/blob/b20b400e2f598c86abaf697d66396… Then further to string_print: https://github.com/alsa-project/alsa-lib/blob/b20b400e2f598c86abaf697d66396… And then in this loop which decides which characters need to be quoted: https://github.com/alsa-project/alsa-lib/blob/b20b400e2f598c86abaf697d66396… *Proposed solution* The characters `[` and `]` should be a reason to put text between quotes. These characters should be added to the switch statement in print_string here: https://github.com/alsa-project/alsa-lib/blob/b20b400e2f598c86abaf697d66396… Regards, Bert Issue URL : https://github.com/alsa-project/alsa-lib/issues/22 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[alsa-devel] When storing settings which contain a [ or ], the setting is not quoted.
by GitHub issues - opened 10 Jan '20

10 Jan '20

alsa-project/alsa-lib issue #22 was opened from Bertware: I am using a Raspberry Pi 1 B+ with a Hifiberry DAC+ADC Pro HAT. This hat contains a PCM5122 Stereo DAC and an ADC. Now to the issue: The ADC has parameters such as `VINR1[SE]` and `VINR2[SE] + VINR1[SE]`. When using `alsactl store` or`alsactl restore`, restoring will fail due to an invalid file. `ALSA lib conf.c:1887:(_snd_config_load_with_include) _toplevel_:354:30:Unexpected char` This error points to the parameter `VINR1[SE]`, which is not surrounded by quotes. The other parameters, which also contain other special characters such as spaces, are surrounded by quotes. An excerpt of the file is included below. This clearly illustrates which names were encapsulated between quotes. ``` control.28 { iface MIXER name 'ADC Right Capture Source' value VINR1[SE] comment { access 'read write' type ENUMERATED count 1 item.0 'No Select' item.1 VINR1[SE] item.2 VINR2[SE] item.3 'VINR2[SE] + VINR1[SE]' item.4 VINR3[SE] item.5 'VINR3[SE] + VINR1[SE]' item.6 'VINR3[SE] + VINR2[SE]' item.7 'VINR3[SE] + VINR2[SE] + VINR1[SE]' item.8 VINR4[SE] item.9 'VINR4[SE] + VINR1[SE]' item.10 'VINR4[SE] + VINR2[SE]' item.11 'VINR4[SE] + VINR2[SE] + VINR1[SE]' item.12 'VINR4[SE] + VINR3[SE]' item.13 'VINR4[SE] + VINR3[SE] + VINR1[SE]' item.14 'VINR4[SE] + VINR3[SE] + VINR2[SE]' item.15 'VINR4[SE] + VINR3[SE] + VINR2[SE] + VINR1[SE]' item.16 '{VIN2P, VIN2M}[DIFF]' item.17 '{VIN3P, VIN3M}[DIFF]' item.18 '{VIN2P, VIN2M}[DIFF] + {VIN3P, VIN3M}[DIFF]' } } ``` Creation of the output data and writing it to a file is handled by the save_state method in alsactl: https://github.com/alsa-project/alsa-utils/blob/master/alsactl/state.c#L1539 This code in turn calls snd_config_save in the alsa-lib project: https://github.com/alsa-project/alsa-lib/blob/b20b400e2f598c86abaf697d66396… Then further to string_print: https://github.com/alsa-project/alsa-lib/blob/b20b400e2f598c86abaf697d66396… And then in this loop which decides which characters need to be quoted: https://github.com/alsa-project/alsa-lib/blob/b20b400e2f598c86abaf697d66396… *Proposed solution* The characters `[` and `]` should be a reason to put text between quotes. These characters should be added to the switch statement in print_string here: https://github.com/alsa-project/alsa-lib/blob/b20b400e2f598c86abaf697d66396… Regards, Bert Issue URL : https://github.com/alsa-project/alsa-lib/issues/22 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[alsa-devel] [PATCH v5 0/2] soundwire: Add support to Qualcomm SoundWire master
by Srinivas Kandagatla 10 Jan '20

10 Jan '20

Thanks for reviewing the v4 patchset. Here is new patchset addressing all the comments from v3 This patchset adds support for Qualcomm SoundWire Master Controller found in most of Qualcomm SoCs and WCD audio codecs. This driver along with WCD934x codec and WSA881x Class-D Smart Speaker Amplifier drivers is tested on on DragonBoard DB845c based of SDM845 SoC and Lenovo YOGA C630 Laptop based on SDM850. SoundWire controller on SDM845 is integrated in WCD934x audio codec via SlimBus interface. Currently this driver is very minimal and only supports PDM. Most of the code in this driver is rework of Qualcomm downstream drivers used in Andriod. Credits to Banajit Goswami and Patrick Lai's Team. TODO: Test and add PCM support. Thanks, srini Changes since v4: - moved stream handling to codec as there is a strong hw requirements on port and PA enable sequence on codec side - removed dummy runtime pm - cleaned up code as suggested by Pierre Srinivas Kandagatla (2): dt-bindings: soundwire: add bindings for Qcom controller soundwire: qcom: add support for SoundWire controller .../bindings/soundwire/qcom,sdw.txt | 167 ++++ drivers/soundwire/Kconfig | 9 + drivers/soundwire/Makefile | 4 + drivers/soundwire/qcom.c | 856 ++++++++++++++++++ 4 files changed, 1036 insertions(+) create mode 100644 Documentation/devicetree/bindings/soundwire/qcom,sdw.txt create mode 100644 drivers/soundwire/qcom.c -- 2.21.0

2 6

[alsa-devel] ALSA does not detect the built-in microphone on HP EliteBook 850 G6
by lazarenkovegor 10 Jan '20

10 Jan '20

Hello! ALSA does not detect the built-in microphone on HP EliteBook 850 G6 with Ubuntu 19.10 Kenrel 5.3.0-27-generic I tried to specify the following "options snd-hda-intel model" in /etc/modprobe.d/alsa-base.conf : - *laptop-amic*,* laptop-dmic* - a recording device has appeared but it does not work. LED of MicMute on hardware button is always ON - *auto*, *3stack*,* hp-gpio4*,* hp-gpio-led*, *hp-dock-pins*, *hp-dock-gpio-mic*, *hp-9480m*, *alc280-hp-headset*, *alc221-hp-mic*, *hp-rp5800 *- there is no audio recorder in the system. LED of MicMute on hardware button is always ON - *hp-gpio2-hotkey *- there is no audio recorder in the system. LED of MicMute on hardware button is always OFF Can you help set up ALSA to work with the specified laptop? If necessary, I can compile and install the necessary patches and send work logs.

1 0

[alsa-devel] Applied "ASoC: max98090: Drop incorrectly applied duplicate commit" to the asoc tree
by Mark Brown 10 Jan '20

10 Jan '20

The patch ASoC: max98090: Drop incorrectly applied duplicate commit has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From a84188eced6109983af54f9435a26d21eac3f8cc Mon Sep 17 00:00:00 2001 From: Mark Brown <broonie(a)kernel.org> Date: Fri, 10 Jan 2020 13:24:02 +0000 Subject: [PATCH] ASoC: max98090: Drop incorrectly applied duplicate commit This reverts commit 4e93c1294f4b051 (ASoC: max98090: fix incorrect helper in max98090_dapm_put_enum_double()) which was misapplied. Reported-by: Marek Szyprowski <m.szyprowski(a)samsung.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/codecs/max98090.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c index ba0e3ba162f8..454cb8e5b0a1 100644 --- a/sound/soc/codecs/max98090.c +++ b/sound/soc/codecs/max98090.c @@ -98,7 +98,7 @@ static int max98090_put_enum_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct snd_soc_component *component = - snd_soc_dapm_kcontrol_component(kcontrol); + snd_soc_kcontrol_component(kcontrol); struct max98090_priv *max98090 = snd_soc_component_get_drvdata(component); int ret; -- 2.20.1

1 0