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

[PATCH] ALSA: usb-audio: initialize the cur variable
by trix＠redhat.com 22 May '21

22 May '21

From: Tom Rix <trix(a)redhat.com> Static analysis reports this problem clock.c:338:10: warning: The right operand of '==' is a garbage value if (i == cur) ^ ~~~ In __uac_clock_find_source() the goto find_others skips over setting of the 'cur' variable. Since the pin loop variable starts with 1, it is safe to initialize cur to 0. Signed-off-by: Tom Rix <trix(a)redhat.com> --- sound/usb/clock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/usb/clock.c b/sound/usb/clock.c index 772478c725c2e..edc458c50bf2c 100644 --- a/sound/usb/clock.c +++ b/sound/usb/clock.c @@ -258,9 +258,10 @@ static int __uac_clock_find_source(struct snd_usb_audio *chip, union uac23_clock_source_desc *source; union uac23_clock_selector_desc *selector; union uac23_clock_multiplier_desc *multiplier; - int ret, i, cur, err, pins, clock_id; + int ret, i, err, pins, clock_id; const u8 *sources; int proto = fmt->protocol; + int cur = 0; entity_id &= 0xff; -- 2.26.3

2 1

[PATCH][next] ALSA: firewire-lib: Fix uninitialized variable err issue
by Colin King 22 May '21

22 May '21

From: Colin Ian King <colin.king(a)canonical.com> Currently in the case where the payload_length is less than the cip_header_size the error return variable err is not being set and function parse_ir_ctx_header can return an uninitialized error return value. Fix this by setting err to zero. Addresses-Coverity: ("Uninitialized scalar variable") Fixes: c09010eeb373 ("ALSA: firewire-lib: handle the case that empty isochronous packet payload for CIP") Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/firewire/amdtp-stream.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c index af5c3629f1ac..242b1147d768 100644 --- a/sound/firewire/amdtp-stream.c +++ b/sound/firewire/amdtp-stream.c @@ -663,6 +663,7 @@ static int parse_ir_ctx_header(struct amdtp_stream *s, unsigned int cycle, } else { // Handle the cycle so that empty packet arrives. cip_header = NULL; + err = 0; *data_blocks = 0; *syt = 0; } -- 2.31.1

3 4

Motu M4 - where to report this issue?
by Georges Basile Stavracas Neto 21 May '21

21 May '21

Greetings ALSA community, I recently acquired a Motu M4 interface, and seems to be working well so far. Everyday usage is completely functional. However, I noticed an odd sound artifact that happens from time to time when using DAWs like Ardour and Waveform11. It's a windy, ghostly sound that happens whenever I open any DAWs (the simple act of opening them triggers this). Interestingly, audio apps that use PulseAudio do not suffer from this issue. It's hard to describe it, so I recorded a video reproducing this problem: https://youtu.be/bM8x-YuXLVI A few things I've discovered while trying to understand what's going on: * It only happens with apps that use JACK or ALSA APIs. Using PulseAudio (through PipeWire) does not trigger it. * Seems like this sound is not an artifact of the interface; it appears that this odd sound is sent to the interface through USB. (You can see this in the video.) * It's triggered per track; in the video, for example, the drums and keyboard tracks are affected independetly. I was oriented in #alsa at Freenode that the output of 'alsa-info' might be helpful, so here it is: http://alsa-project.org/db/?f=62f686710cc6c9344a8986707bf3d09248c514d1 (I'm running this on top of a 5.12.5 kernel, which should include this fix: https://bugzilla.kernel.org/show_bug.cgi?id=207023) I'd like to know where should I report this bug (kernel bugzilla?), and if there's any other information I can provide to help fixing it. With respect, Georges

2 1

[PATCH 1/2] ASoC: Intel: common: Add entries for sdw codecs in ADL match table
by Kai Vehmanen 21 May '21

21 May '21

From: Vamshi Krishna Gopal <vamshi.krishna.gopal(a)intel.com> RT5682 and Max98373 are added with SDW0,SDW2 links respectively. Signed-off-by: Vamshi Krishna Gopal <vamshi.krishna.gopal(a)intel.com> Reviewed-by: Bard Liao <bard.liao(a)intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> --- .../intel/common/soc-acpi-intel-adl-match.c | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c index 39ac6d52106f..22c465f1d5d8 100644 --- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c @@ -223,6 +223,30 @@ static const struct snd_soc_acpi_link_adr adl_sdw_rt1316_link2_rt714_link0[] = { {} }; +static const struct snd_soc_acpi_adr_device mx8373_2_adr[] = { + { + .adr = 0x000223019F837300ull, + .num_endpoints = 1, + .endpoints = &spk_l_endpoint, + .name_prefix = "Left" + }, + { + .adr = 0x000227019F837300ull, + .num_endpoints = 1, + .endpoints = &spk_r_endpoint, + .name_prefix = "Right" + } +}; + +static const struct snd_soc_acpi_adr_device rt5682_0_adr[] = { + { + .adr = 0x000021025D568200ull, + .num_endpoints = 1, + .endpoints = &single_endpoint, + .name_prefix = "rt5682" + } +}; + static const struct snd_soc_acpi_link_adr adl_rvp[] = { { .mask = BIT(0), @@ -232,6 +256,20 @@ static const struct snd_soc_acpi_link_adr adl_rvp[] = { {} }; +static const struct snd_soc_acpi_link_adr adl_chromebook_base[] = { + { + .mask = BIT(0), + .num_adr = ARRAY_SIZE(rt5682_0_adr), + .adr_d = rt5682_0_adr, + }, + { + .mask = BIT(2), + .num_adr = ARRAY_SIZE(mx8373_2_adr), + .adr_d = mx8373_2_adr, + }, + {} +}; + static const struct snd_soc_acpi_codecs adl_max98373_amp = { .num_codecs = 1, .codecs = {"MX98373"} @@ -295,6 +333,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[] = { .drv_name = "sof_sdw", .sof_tplg_filename = "sof-adl-rt711.tplg", }, + { + .link_mask = 0x5, /* rt5682 on link0 & 2xmax98373 on link 2 */ + .links = adl_chromebook_base, + .drv_name = "sof_sdw", + .sof_fw_filename = "sof-adl.ri", + .sof_tplg_filename = "sof-adl-sdw-max98373-rt5682.tplg", + }, {}, }; EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_adl_sdw_machines); base-commit: aa736700f42fa0813e286ca2f9274ffaa25163b9 -- 2.31.0

2 2

Motu M4 - where to report this issue?
by Georges Basile Stavracas Neto 21 May '21

21 May '21

Greetings ALSA community, I recently acquired a Motu M4 interface, and seems to be working well so far. Everyday usage is completely functional. However, I noticed an odd sound artifact that happens from time to time when using DAWs like Ardour and Waveform11. It's a windy, ghostly sound that happens whenever I open any DAWs (the simple act of opening them triggers this). Interestingly, audio apps that use PulseAudio do not suffer from this issue. It's hard to describe it, so I recorded a video reproducing this problem: https://youtu.be/bM8x-YuXLVI A few things I've discovered while trying to understand what's going on: * It only happens with apps that use JACK or ALSA APIs. Using PulseAudio (through PipeWire) does not trigger it. * Seems like this sound is not an artifact of the interface; it appears that this odd sound is sent to the interface through USB. (You can see this in the video.) * It's triggered per track; in the video, for example, the drums and keyboard tracks are affected independetly. I was oriented in #alsa at Freenode that the output of 'alsa-info' might be helpful, so here it is: http://alsa-project.org/db/?f=62f686710cc6c9344a8986707bf3d09248c514d1 (I'm running this on top of a 5.12.5 kernel, which should include this fix: https://bugzilla.kernel.org/show_bug.cgi?id=207023) I'd like to know where should I report this bug (kernel bugzilla?), and if there's any other information I can provide to help fixing it. With respect, Georges

1 0

[PATCH v1] ASoC: dt-bindings: Convert imx-audmux binding to json schema
by Oleksij Rempel 21 May '21

21 May '21

Convert the imx-audmux binding to DT schema format using json-schema Signed-off-by: Oleksij Rempel <o.rempel(a)pengutronix.de> --- .../devicetree/bindings/sound/imx-audmux.txt | 28 ----- .../devicetree/bindings/sound/imx-audmux.yaml | 119 ++++++++++++++++++ 2 files changed, 119 insertions(+), 28 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/imx-audmux.txt create mode 100644 Documentation/devicetree/bindings/sound/imx-audmux.yaml diff --git a/Documentation/devicetree/bindings/sound/imx-audmux.txt b/Documentation/devicetree/bindings/sound/imx-audmux.txt deleted file mode 100644 index 2db4dcbee1b9..000000000000 --- a/Documentation/devicetree/bindings/sound/imx-audmux.txt +++ /dev/null @@ -1,28 +0,0 @@ -Freescale Digital Audio Mux (AUDMUX) device - -Required properties: - - - compatible : "fsl,imx21-audmux" for AUDMUX version firstly used - on i.MX21, or "fsl,imx31-audmux" for the version - firstly used on i.MX31. - - - reg : Should contain AUDMUX registers location and length. - -An initial configuration can be setup using child nodes. - -Required properties of optional child nodes: - - - fsl,audmux-port : Integer of the audmux port that is configured by this - child node. - - - fsl,port-config : List of configuration options for the specific port. - For imx31-audmux and above, it is a list of tuples - <ptcr pdcr>. For imx21-audmux it is a list of pcr - values. - -Example: - -audmux@21d8000 { - compatible = "fsl,imx6q-audmux", "fsl,imx31-audmux"; - reg = <0x021d8000 0x4000>; -}; diff --git a/Documentation/devicetree/bindings/sound/imx-audmux.yaml b/Documentation/devicetree/bindings/sound/imx-audmux.yaml new file mode 100644 index 000000000000..6078ce13bd46 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/imx-audmux.yaml @@ -0,0 +1,119 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/imx-audmux.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Freescale Digital Audio Mux device + +maintainers: + - Oleksij Rempel <o.rempel(a)pengutronix.de> + +properties: + compatible: + oneOf: + - items: + - enum: + - fsl,imx27-audmux + - const: fsl,imx21-audmux + - items: + - enum: + - fsl,imx25-audmux + - fsl,imx35-audmux + - fsl,imx50-audmux + - fsl,imx51-audmux + - fsl,imx53-audmux + - fsl,imx6q-audmux + - fsl,imx6sl-audmux + - fsl,imx6sll-audmux + - fsl,imx6sx-audmux + - const: fsl,imx31-audmux + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + + clock-names: + items: + - const: audmux + +patternProperties: + "^mux-[0-9a-z]*$": + type: object + properties: + fsl,audmux-port: + $ref: /schemas/types.yaml#/definitions/uint32 + description: | + Integer of the audmux port that is configured by this child node + + fsl,port-config: + $ref: /schemas/types.yaml#/definitions/uint32-array + description: | + List of configuration options for the specific port. + For imx31-audmux and above, it is a list of tuples ptcr pdcr. + For imx21-audmux it is a list of pcr values. + + required: + - fsl,audmux-port + - fsl,port-config + + additionalProperties: false + +required: + - compatible + - reg + +additionalProperties: false + +examples: + - | + audmux@21d8000 { + compatible = "fsl,imx6q-audmux", "fsl,imx31-audmux"; + reg = <0x021d8000 0x4000>; + }; + - | + audmux@10016000 { + compatible = "fsl,imx27-audmux", "fsl,imx21-audmux"; + reg = <0x10016000 0x1000>; + clocks = <&clks 1>; + clock-names = "audmux"; + + mux-ssi0 { + fsl,audmux-port = <0>; + fsl,port-config = <0xcb205000>; + }; + + mux-pins4 { + fsl,audmux-port = <2>; + fsl,port-config = <0x00001000>; + }; + }; + - | + #include <dt-bindings/sound/fsl-imx-audmux.h> + audmux@21d8000 { + compatible = "fsl,imx6q-audmux", "fsl,imx31-audmux"; + reg = <0x021d8000 0x4000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_audmux>; + + mux-ssi1 { + fsl,audmux-port = <0>; + fsl,port-config = < + IMX_AUDMUX_V2_PTCR_SYN 0 + IMX_AUDMUX_V2_PTCR_TFSEL(2) 0 + IMX_AUDMUX_V2_PTCR_TCSEL(2) 0 + IMX_AUDMUX_V2_PTCR_TFSDIR 0 + IMX_AUDMUX_V2_PTCR_TCLKDIR IMX_AUDMUX_V2_PDCR_RXDSEL(2) + >; + }; + + mux-pins3 { + fsl,audmux-port = <2>; + fsl,port-config = < + IMX_AUDMUX_V2_PTCR_SYN IMX_AUDMUX_V2_PDCR_RXDSEL(0) + 0 IMX_AUDMUX_V2_PDCR_TXRXEN + >; + }; + }; -- 2.29.2

2 2

[PATCH 0/7] ASoC: SOF: code cleanups for 5.14
by Kai Vehmanen 21 May '21

21 May '21

Set of code cleanups for issues found in code review. Jaska Uimonen (1): ASoC: SOF: topology: fix assignment to use le32_to_cpu Keyon Jie (1): ASoC: SOF: ops: print out the polling register Peter Ujfalusi (4): ASoC: SOF: Check desc->ops directly in acpi/pci/of probe functions ASoC: SOF: pci: No need to cast second time to save the desc ASoC: SOF: loader: Use snd_sof_dsp_block_read() instead sof_block_read() ASoC: SOF: Intel: hda: Remove conditions against CONFIG_PCI Pierre-Louis Bossart (1): ASoC: SOF: ops: don't return void value sound/soc/sof/intel/hda.c | 8 +++----- sound/soc/sof/loader.c | 2 +- sound/soc/sof/ops.h | 10 ++++++---- sound/soc/sof/sof-acpi-dev.c | 5 +---- sound/soc/sof/sof-of-dev.c | 5 +---- sound/soc/sof/sof-pci-dev.c | 7 ++----- sound/soc/sof/topology.c | 2 +- 7 files changed, 15 insertions(+), 24 deletions(-) base-commit: aa736700f42fa0813e286ca2f9274ffaa25163b9 -- 2.31.0

2 8

[PATCH] ASoC: qcom: lpass-cpu: Use optional clk APIs
by Stephen Boyd 21 May '21

21 May '21

This driver spits out a warning for me at boot: sc7180-lpass-cpu 62f00000.lpass: asoc_qcom_lpass_cpu_platform_probe() error getting optional null: -2 but it looks like it is all an optional clk. Use the optional clk APIs here so that we don't see this message and everything else is the same. Cc: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Cc: Banajit Goswami <bgoswami(a)codeaurora.org> Fixes: 3e53ac8230c1 ("ASoC: qcom: make osr clock optional") Signed-off-by: Stephen Boyd <swboyd(a)chromium.org> --- sound/soc/qcom/lpass-cpu.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c index c62d2612e8f5..28c7497344e3 100644 --- a/sound/soc/qcom/lpass-cpu.c +++ b/sound/soc/qcom/lpass-cpu.c @@ -835,18 +835,8 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) if (dai_id == LPASS_DP_RX) continue; - drvdata->mi2s_osr_clk[dai_id] = devm_clk_get(dev, + drvdata->mi2s_osr_clk[dai_id] = devm_clk_get_optional(dev, variant->dai_osr_clk_names[i]); - if (IS_ERR(drvdata->mi2s_osr_clk[dai_id])) { - dev_warn(dev, - "%s() error getting optional %s: %ld\n", - __func__, - variant->dai_osr_clk_names[i], - PTR_ERR(drvdata->mi2s_osr_clk[dai_id])); - - drvdata->mi2s_osr_clk[dai_id] = NULL; - } - drvdata->mi2s_bit_clk[dai_id] = devm_clk_get(dev, variant->dai_bit_clk_names[i]); if (IS_ERR(drvdata->mi2s_bit_clk[dai_id])) { base-commit: 6efb943b8616ec53a5e444193dccf1af9ad627b5 -- https://chromeos.dev

3 2

[PATCH 0/2] ALSA: usb-audio: scarlett2: Fix device hang with ehci-pci
by Geoffrey D. Bennett 21 May '21

21 May '21

This patchset fixes a show-stopper bug with the Scarlett Gen 2 mixer driver not working with the ehci-pci host driver, and improves the user experience with better driver startup messages. Patch 1: Fixes the driver hanging the device by using the correct direction pipe now. Patch 2: Improves the user experience with more specific enabling instructions, positive feedback when it is enabled or if initialisation fails. The previous instructions were incomplete and didn't confirm that the driver was enabled. #Cc: stable(a)vger.kernel.org please (sorry, not sure if I should be sending this there myself or if it gets added by Takashi after review?) Geoffrey D. Bennett (2): ALSA: usb-audio: scarlett2: Fix device hang with ehci-pci ALSA: usb-audio: scarlett2: Improve driver startup messages sound/usb/mixer_quirks.c | 2 +- sound/usb/mixer_scarlett_gen2.c | 81 +++++++++++++++++++++------------ sound/usb/mixer_scarlett_gen2.h | 2 +- 3 files changed, 53 insertions(+), 32 deletions(-) -- 2.31.1

2 3

[PATCH] ALSA: usb-audio: fix control-request direction
by Johan Hovold 21 May '21

21 May '21

The direction of the pipe argument must match the request-type direction bit or control requests may fail depending on the host-controller-driver implementation. Fix the UAC2_CS_CUR request which erroneously used usb_sndctrlpipe(). Fixes: 93db51d06b32 ("ALSA: usb-audio: Check valid altsetting at parsing rates for UAC2/3") Cc: stable(a)vger.kernel.org # 5.10 Signed-off-by: Johan Hovold <johan(a)kernel.org> --- There's a related bug in sound/usb/mixer_scarlett_gen2.c, which Geoffrey reported and said he was preparing a patch for here: https://lore.kernel.org/r/20210520180819.GA95348@m.b4.vu Johan sound/usb/format.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/usb/format.c b/sound/usb/format.c index e6ff317a6785..2287f8c65315 100644 --- a/sound/usb/format.c +++ b/sound/usb/format.c @@ -436,7 +436,7 @@ static bool check_valid_altsetting_v2v3(struct snd_usb_audio *chip, int iface, if (snd_BUG_ON(altsetting >= 64 - 8)) return false; - err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), UAC2_CS_CUR, + err = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_CUR, USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN, UAC2_AS_VAL_ALT_SETTINGS << 8, iface, &raw_data, sizeof(raw_data)); -- 2.26.3

2 1