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

Quirks for MacroSilicon MS2100/MS2106
by John Veness 25 Jun '22

25 Jun '22

Hello, This is my first ever kernel work, so I hope I am doing everything correctly. I have a USB analogue AV capture dongle with a MacroSilicon MS2100E chip inside. PID 0x534d, VID 0x0021 (534d:0021). Apparently the MS2106 uses the same PID/VID, so hopefully acts the same, but I don't have one to check. For audio, the MS2100E has the same problems as the MS2109 USB HDMI capture dongle, namely claiming 96kHz mono sound when it's actually 48kHz stereo, and with left/right channel problems. Luckily, the fix is the exact same as that for the MS2109, as first implemented by Marcan (Hector Martin) in July 2020. Below is a patch which is basically a copy and paste of his, with a different VID. I have tested this patch in 5.19.0 RC2. I haven't recruited any other testers. Even with this patch, there is a remaining problem, which is not present in the MS2109. The sound sample values range from 0x0000 to 0x7fff, with silence around 0x4000, i.e. 15-bit-ish audio. This actually sounds OK to the ear (although half as loud as it should be), but looks odd when looking at the waveform, and makes volume meters always think the sound is very loud. To convert to s16le, I can bitshift one bit left, and subtract 32768. I'm told that this isn't something that can or should be done in the kernel, but should be in userspace. Any more advice on how to fix this remaining quirk would be very welcome. Nonetheless, as I say, with the following kernel patch the captured audio certainly sounds right, so is a big improvement and makes these dongles usable: diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 4f56e1784932..853da162fd18 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -3802,6 +3802,54 @@ YAMAHA_DEVICE(0x7010, "UB99"), } }, +/* + * MacroSilicon MS2100/MS2106 based AV capture cards + * + * These claim 96kHz 1ch in the descriptors, but are actually 48kHz 2ch. + * They also need QUIRK_FLAG_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 an issue with initial stream alignment that causes the + * channels to be swapped and out of phase, which is dealt with in quirks.c. + */ +{ + USB_AUDIO_DEVICE(0x534d, 0x0021), + .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { + .vendor_name = "MacroSilicon", + .product_name = "MS210x", + .ifnum = QUIRK_ANY_INTERFACE, + .type = QUIRK_COMPOSITE, + .data = &(const struct snd_usb_audio_quirk[]) { + { + .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 + } + } + } +}, + /* * MacroSilicon MS2109 based HDMI capture cards * diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index e8468f9b007d..a72874bc0936 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1478,6 +1478,7 @@ void snd_usb_set_format_quirk(struct snd_usb_substream *subs, case USB_ID(0x041e, 0x3f19): /* E-Mu 0204 USB */ set_format_emu_quirk(subs, fmt); break; + case USB_ID(0x534d, 0x0021): /* MacroSilicon MS2100/MS2106 */ case USB_ID(0x534d, 0x2109): /* MacroSilicon MS2109 */ subs->stream_offset_adj = 2; break; @@ -1904,6 +1905,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { QUIRK_FLAG_IGNORE_CTL_ERROR), DEVICE_FLG(0x413c, 0xa506, /* Dell AE515 sound bar */ QUIRK_FLAG_GET_SAMPLE_RATE), + DEVICE_FLG(0x534d, 0x0021, /* MacroSilicon MS2100/MS2106 */ + QUIRK_FLAG_ALIGN_TRANSFER), DEVICE_FLG(0x534d, 0x2109, /* MacroSilicon MS2109 */ QUIRK_FLAG_ALIGN_TRANSFER), DEVICE_FLG(0x1224, 0x2a25, /* Jieli Technology USB PHY 2.0 */ Thanks for reading and considering this patch. John Veness

4 7

[PATCH 00/11] ctl: elem-value: rewrite getter methods
by GitHub pull_request - opened 25 Jun '22

25 Jun '22

alsa-project/alsa-gobject pull request #79 was opened from takaswie: This patchset rewrites getter methods of ALSACtl.ElemValue so that they just return pointer of internal storage instead of copying to user buffer. ``` Takashi Sakamoto (11): timer: fix entry in exported symbol map ctl: elem-value: clear value field at setter method ctl: elem-value: rewrite getter for boolean values ctl: elem-value: rewrite getter for 32 bit signed integer values ctl: elem-value: rewrite getter for enumeration index values ctl: elem-value: rewrite getter for 8 bit unsigned integer values ctl: elem-value: rewrite getter for IEC 60958 channel status ctl: elem-value: rewrite getter for IEC 60958 user data ctl: elem-value: rewrite getter for 64 bit signed integer values ctl: elem-value: update class description update README with compatibility note README.rst | 124 ++++++++++++++++++++++++++++++-- samples/ctl | 11 ++- src/ctl/alsactl.map | 15 ++-- src/ctl/elem-value.c | 152 +++++++++++++++++++++------------------- src/ctl/elem-value.h | 14 ++-- src/timer/alsatimer.map | 3 +- 6 files changed, 218 insertions(+), 101 deletions(-) ``` Request URL : https://github.com/alsa-project/alsa-gobject/pull/79 Patch URL : https://github.com/alsa-project/alsa-gobject/pull/79.patch Repository URL: https://github.com/alsa-project/alsa-gobject

1 0

sof-soundwire: broken settings for RT711 and RT711-SDCA
by GitHub issues - opened 24 Jun '22

24 Jun '22

alsa-project/alsa-ucm-conf issue #179 was opened from plbossart: [plb@fedora ~]$ alsaucm -c sof-soundwire set _verb HiFi ALSA lib main.c:826:(execute_sequence) unable to execute cset 'name='PGA2.0 2 Master Capture Switch' 0' ALSA lib main.c:2573:(set_verb_user) error: failed to initialize new use case: HiFi There's not such thing as a switch here: amixer -Dhw:0 sget 'PGA2.0 2 Master',0 Simple mixer control 'PGA2.0 2 Master',0 Capabilities: cvolume Capture channels: Front Left - Front Right Limits: Capture 0 - 80 Front Left: Capture 80 [100%] [30.00dB] Front Right: Capture 80 [100%] [30.00dB] In addition, it makes no sense to use an SOF control to set the volume/switch on the headset codec side. The volume control should be done in the codec, not in the SOF firmware. Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/179 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

UCM for Behringer UMC204HD broken
by GitHub issues - reopened 24 Jun '22

24 Jun '22

alsa-project/alsa-ucm-conf issue #177 was reopened from gregory112: This is related: [https://github.com/alsa-project/alsa-ucm-conf/pull/128](https://github.com/…. I came from this issue I filed in Pipewire: [https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2471](https://git…. So previously a while back, Behringer UMC204HD was detected as a single stereo input channel. This sound card has two inputs. However, just recently, the channel was separated into two mono channels, which was perfect. However, with the most recent update (I don't know if it's pipewire, pipewire-alsa, alsa-card-profiles, or alsa-ucm), it reverted back into the stereo single input (left/right) mode. What can I do to bring back the previous correct settings (apart from the bugs I filed in Pipewire)? I did not modify any ALSA UCM files. Previously, a while back: it is detected as UMC204HD 192k (stereo input). Then: UMC204HD 192k Line 1 (mono) and UMC204HD 192k Line 2 (mono) (this is how it's supposed to be, I think it's from the pull request above). Now: Back to UMC204HD 192k (stereo input). Might also be helpful but I am using pipewire. This is the output of `alsaucm listcards`: ``` ALSA lib ucm_subs.c:799:(uc_mgr_get_substituted_value) variable '${var:DirectCardName}' is not defined in this context! ALSA lib main.c:1541:(snd_use_case_mgr_open) error: failed to import hw:2 use case configuration -22 ALSA lib parser.c:2957:(uc_mgr_scan_master_configs) Unable to open '-hw:2': Invalid argument alsaucm: error failed to get card list: Invalid argument ``` There is an error for hw:2, which I assume is the Behringer. Here is the result of `alsaucm -chw:2 dump text`. ``` ALSA lib ucm_subs.c:799:(uc_mgr_get_substituted_value) variable '${var:DirectCardName}' is not defined in this context! ALSA lib main.c:1541:(snd_use_case_mgr_open) error: failed to import hw:2 use case configuration -22 alsaucm: error failed to open sound card hw:2: Invalid argument ``` Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/177 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

UCM for Behringer UMC204HD not working
by GitHub issues - opened 24 Jun '22

24 Jun '22

alsa-project/alsa-ucm-conf issue #178 was opened from maru-sama: Similar to #177 I have problem with the ucm setting for the UMC204HD. The problem is that apparently no mixer is being created for the device, when trying to open the card with alsamixer it just fails with cannot load mixer controls. the mixer has been created though if I do not missread the output from alsa-info.sh (attached) [alsa-info.txt](https://github.com/alsa-project/alsa-ucm-conf/files/8977069/… I am using alsa-libs 2.0.7 and the latest ucm from master on ubuntu 22.04 to make sure that I have all the minimum requirements. Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/178 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH] ASoC: rockchip: i2s: Fix missing error code in rockchip_i2s_probe()
by Jiapeng Chong 24 Jun '22

24 Jun '22

The error code is missing in this code scenario, add the error code '-EINVAL' to the return value 'ret'. This was found by coccicheck: sound/soc/rockchip/rockchip_i2s.c:810 rockchip_i2s_probe() warn: missing error code 'ret'. Signed-off-by: Jiapeng Chong <jiapeng.chong(a)linux.alibaba.com> --- sound/soc/rockchip/rockchip_i2s.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index d300eee9ddaa..0ed01624a2db 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -807,6 +807,7 @@ static int rockchip_i2s_probe(struct platform_device *pdev) i2s->bclk_off = pinctrl_lookup_state(i2s->pinctrl, "bclk_off"); if (IS_ERR_OR_NULL(i2s->bclk_off)) { dev_err(&pdev->dev, "failed to find i2s bclk_off\n"); + ret = -EINVAL; goto err_clk; } } -- 2.20.1.7.g153144c

2 1

[PATCH] ASoC: audio_graph_card2: Fix port numbers in example
by Sascha Hauer 24 Jun '22

24 Jun '22

The example in audio-graph-card2.c has multiple nodes with the same name in it. Change the port numbers to get different names. Signed-off-by: Sascha Hauer <s.hauer(a)pengutronix.de> --- sound/soc/generic/audio-graph-card2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/generic/audio-graph-card2.c b/sound/soc/generic/audio-graph-card2.c index 77ac4051b8276..d34b29a49268e 100644 --- a/sound/soc/generic/audio-graph-card2.c +++ b/sound/soc/generic/audio-graph-card2.c @@ -90,12 +90,12 @@ links indicates connection part of CPU side (= A). ports@0 { (X) (A) mcpu: port@0 { mcpu0_ep: endpoint { remote-endpoint = <&mcodec0_ep>; }; }; (y) port@1 { mcpu1_ep: endpoint { remote-endpoint = <&cpu1_ep>; }; }; -(y) port@1 { mcpu2_ep: endpoint { remote-endpoint = <&cpu2_ep>; }; }; +(y) port@2 { mcpu2_ep: endpoint { remote-endpoint = <&cpu2_ep>; }; }; }; ports@1 { (X) port@0 { mcodec0_ep: endpoint { remote-endpoint = <&mcpu0_ep>; }; }; -(y) port@0 { mcodec1_ep: endpoint { remote-endpoint = <&codec1_ep>; }; }; -(y) port@1 { mcodec2_ep: endpoint { remote-endpoint = <&codec2_ep>; }; }; +(y) port@1 { mcodec1_ep: endpoint { remote-endpoint = <&codec1_ep>; }; }; +(y) port@2 { mcodec2_ep: endpoint { remote-endpoint = <&codec2_ep>; }; }; }; }; }; -- 2.30.2

2 1

[PATCH v1] ASoC: sgtl5000: Fix noise on shutdown/remove
by Francesco Dolcini 24 Jun '22

24 Jun '22

Put the SGTL5000 in a silent/safe state on shutdown/remove, this is required since the SGTL5000 produces a constant noise on its output after it is configured and its clock is removed. Without this change this is happening every time the module is unbound/removed or from reboot till the clock is enabled again. The issue was experienced on both a Toradex Colibri/Apalis iMX6, but can be easily reproduced everywhere just playing something on the codec and after that removing/unbinding the driver. Fixes: 9b34e6cc3bc2 ("ASoC: Add Freescale SGTL5000 codec support") Signed-off-by: Francesco Dolcini <francesco.dolcini(a)toradex.com> --- sound/soc/codecs/sgtl5000.c | 9 +++++++++ sound/soc/codecs/sgtl5000.h | 1 + 2 files changed, 10 insertions(+) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index 2aa48aef6a97..3363d1696ad7 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -1795,6 +1795,9 @@ static int sgtl5000_i2c_remove(struct i2c_client *client) { struct sgtl5000_priv *sgtl5000 = i2c_get_clientdata(client); + regmap_write(sgtl5000->regmap, SGTL5000_CHIP_DIG_POWER, SGTL5000_DIG_POWER_DEFAULT); + regmap_write(sgtl5000->regmap, SGTL5000_CHIP_ANA_POWER, SGTL5000_ANA_POWER_DEFAULT); + clk_disable_unprepare(sgtl5000->mclk); regulator_bulk_disable(sgtl5000->num_supplies, sgtl5000->supplies); regulator_bulk_free(sgtl5000->num_supplies, sgtl5000->supplies); @@ -1802,6 +1805,11 @@ static int sgtl5000_i2c_remove(struct i2c_client *client) return 0; } +static void sgtl5000_i2c_shutdown(struct i2c_client *client) +{ + sgtl5000_i2c_remove(client); +} + static const struct i2c_device_id sgtl5000_id[] = { {"sgtl5000", 0}, {}, @@ -1822,6 +1830,7 @@ static struct i2c_driver sgtl5000_i2c_driver = { }, .probe_new = sgtl5000_i2c_probe, .remove = sgtl5000_i2c_remove, + .shutdown = sgtl5000_i2c_shutdown, .id_table = sgtl5000_id, }; diff --git a/sound/soc/codecs/sgtl5000.h b/sound/soc/codecs/sgtl5000.h index 56ec5863f250..3a808c762299 100644 --- a/sound/soc/codecs/sgtl5000.h +++ b/sound/soc/codecs/sgtl5000.h @@ -80,6 +80,7 @@ /* * SGTL5000_CHIP_DIG_POWER */ +#define SGTL5000_DIG_POWER_DEFAULT 0x0000 #define SGTL5000_ADC_EN 0x0040 #define SGTL5000_DAC_EN 0x0020 #define SGTL5000_DAP_POWERUP 0x0010 -- 2.25.1

3 2

[PATCH] ASoC: cs35l41: Add support for CLSA3541 ACPI device ID
by Cristian Ciocaltea 24 Jun '22

24 Jun '22

Add support for the CLSA3541 ACPI device ID used on Valve's Steam Deck. The driver is fully compatible with the indicated hardware, hence no additional changes are required. Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea(a)collabora.com> --- sound/soc/codecs/cs35l41-spi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/cs35l41-spi.c b/sound/soc/codecs/cs35l41-spi.c index 9e19c946a66b..5c8bb24909eb 100644 --- a/sound/soc/codecs/cs35l41-spi.c +++ b/sound/soc/codecs/cs35l41-spi.c @@ -74,6 +74,7 @@ MODULE_DEVICE_TABLE(of, cs35l41_of_match); #ifdef CONFIG_ACPI static const struct acpi_device_id cs35l41_acpi_match[] = { { "CSC3541", 0 }, /* Cirrus Logic PnP ID + part ID */ + { "CLSA3541", 0 }, /* Cirrus Logic PnP ID + part ID */ {}, }; MODULE_DEVICE_TABLE(acpi, cs35l41_acpi_match); -- 2.36.1

3 2

[PATCH v4 00/17] ASoC: Intel: haswell and broadwell boards update
by Cezary Rojewski 24 Jun '22

24 Jun '22

A number of patches improving overall quality and readability of haswell.c and broadwell.c source files found in sound/soc/intel/boards. Both files are first renamed and only then actual changes are being incrementally added. The respective names are: hsw_rt5640 and bdw_rt286 to match the pattern found in more recent boards. Most patches bring no functional change - the more impactful patches at are placed the end: Refactor of suspend/resume flow for the bdw_rt286 board by dropping dev->remove() in favour of card->remove() and adjust jack handling to reduce code size slightly by implementing card_set_jack(). The last patch is removing of FE DAI ops. Given the existence of platform FE DAI capabilities (either static declaration or through topology file), this code is redundant. Changes in v4: - just a rebase to fix missed conflicts with for-next Changes in v3: - Patch 16/17 refactoring suspend/resume has been renamed to "Refactor jack handling". Dropped the usage of card->remove() in favor of link->exit() in that very patch Changes in v2: - fixed wording error in patch 02/17 so it correctly mentions 'haswell_rt5640', not 'broadwell_rt286' - decided not to add kernel module names changes to this patchset so the review is not complicated unnecessarily. Will send them separately instead Cezary Rojewski (17): ASoC: Intel: Rename haswell source file to hsw_rt5640 ASoC: Intel: hsw_rt5640: Reword prefixes of all driver members ASoC: Intel: hsw_rt5640: Reword driver name ASoC: Intel: hsw_rt5640: Update code indentation ASoC: Intel: hsw_rt5640: Update file comments ASoC: Intel: hsw_rt5640: Improve probe() function quality ASoC: Intel: hsw_rt5640: Improve hw_params() debug-ability ASoC: Intel: Rename broadwell source file to bdw_rt286 ASoC: Intel: bdw_rt286: Reword prefixes of all driver members ASoC: Intel: bdw_rt286: Reword driver name ASoC: Intel: bdw_rt286: Update code indentation ASoC: Intel: bdw_rt286: Update file comments ASoC: Intel: bdw_rt286: Improve probe() function quality ASoC: Intel: bdw_rt286: Improve hw_params() debug-ability ASoC: Intel: bdw_rt286: Improve codec_init() quality ASoC: Intel: bdw_rt286: Refactor jack handling ASoC: Intel: bdw_rt286: Remove FE DAI ops sound/soc/intel/boards/Kconfig | 4 +- sound/soc/intel/boards/Makefile | 4 +- sound/soc/intel/boards/bdw_rt286.c | 256 +++++++++++++ sound/soc/intel/boards/broadwell.c | 338 ------------------ sound/soc/intel/boards/haswell.c | 202 ----------- sound/soc/intel/boards/hsw_rt5640.c | 176 +++++++++ .../common/soc-acpi-intel-hsw-bdw-match.c | 6 +- 7 files changed, 439 insertions(+), 547 deletions(-) create mode 100644 sound/soc/intel/boards/bdw_rt286.c delete mode 100644 sound/soc/intel/boards/broadwell.c delete mode 100644 sound/soc/intel/boards/haswell.c create mode 100644 sound/soc/intel/boards/hsw_rt5640.c -- 2.25.1

3 24