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

[PATCH RFC alsa-ucm-conf] sof-hda-dsp: Use Master mixer to control volume with dual stereo speakers
by Benjamin Poirier 03 Jul '20

03 Jul '20

The Lenovo ThinkPad X1 Carbon 7th is a laptop with two sets of stereo speakers driven from a single stereo output. The volume of each set of speakers can be controlled independently through two separate mixers. In that case, one of those mixers serves a dual purpose: it also controls headphone volume. With the current ucm profile, when outputting to speakers, pulseaudio uses only the mixer for the front speakers to control volume. This is ineffective; rear speaker volume must be controlled as well. In order to control both sets of speakers at once, indicate that the Master mixer should be used. Moreover, when switching between speaker and headphone outputs, the level of the dual purpose mixer should be restored. Since this kind of constraint cannot be described with ucm, indicate that the Master mixer should be used to control volume instead when outputting to headphones. This patch depends on a modification to the snd_hda_codec_realtek kernel driver used on that system to rename one of the controls. Signed-off-by: Benjamin Poirier <benjamin.poirier(a)gmail.com> --- Note that I plan to submit the related kernel patch upstream shortly, in the meantime, it is available here: https://github.com/gobenji/thinkpad-x1-gen7-sound Also note that this patch is based on commit 38e5906cd1b1 ("sof-hda-dsp: fix the device order (Hdmi devices)"). While testing with libasound built from alsa-lib git head 485930ea5dc8 ("ucm: substitution - remove duplicate allow_empty assignment"), alsa-ucm-conf versions including dcef48f13d4f ("HDA-Intel: add support for AMD acp microphone devices") and newer do not work for me. I've tested up to current head, ffe0cab5cfce ("sof-hda-dsp: use sof-hda-dsp/Hdmi.conf"). Looking at the output of `pulseaudio --log-level=debug`, things go wrong at: I: [pulseaudio] (alsa-lib)main.c: error: failed to import sof-hda-dsp use case configuration -17 ucm2/sof-hda-dsp/HiFi.conf | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/ucm2/sof-hda-dsp/HiFi.conf b/ucm2/sof-hda-dsp/HiFi.conf index 62358e2..661a086 100644 --- a/ucm2/sof-hda-dsp/HiFi.conf +++ b/ucm2/sof-hda-dsp/HiFi.conf @@ -25,10 +25,22 @@ SectionDevice."Headphones" { Value { PlaybackPriority 200 PlaybackPCM "hw:${CardId}" - PlaybackMixerElem "Headphone" PlaybackMasterElem "Master" - PlaybackVolume "Headphone Playback Volume" PlaybackSwitch "Headphone Playback Switch" + If.hpmixer { + Condition { + Type ControlExists + Control "name='Headphone/Bass Speaker Playback Volume'" + } + True { + PlaybackMixerElem "Master" + PlaybackVolume "Master Playback Volume" + } + False { + PlaybackMixerElem "Headphone" + PlaybackVolume "Headphone Playback Volume" + } + } If.jack { Condition { Type ControlExists @@ -77,10 +89,22 @@ SectionDevice."Speaker" { Value { PlaybackPriority 100 PlaybackPCM "hw:${CardId}" - PlaybackMixerElem "Speaker" PlaybackMasterElem "Master" - PlaybackVolume "Speaker Playback Volume" PlaybackSwitch "Speaker Playback Switch" + If.spkmixer { + Condition { + Type ControlExists + Control "name='Headphone/Bass Speaker Playback Volume'" + } + True { + PlaybackMixerElem "Master" + PlaybackVolume "Master Playback Volume" + } + False { + PlaybackMixerElem "Speaker" + PlaybackVolume "Speaker Playback Volume" + } + } } } -- 2.27.0

1 0

[PATCH 1/3] ALSA: hda/realtek - Enable audio jacks of Acer vCopperbox with ALC269VC
by Jian-Hong Pan 03 Jul '20

03 Jul '20

The Acer desktop vCopperbox with ALC269VC cannot detect the MIC of headset, the line out and internal speaker until ALC269VC_FIXUP_ACER_VCOPPERBOX_PINS quirk applied. Signed-off-by: Jian-Hong Pan <jian-hong(a)endlessm.com> Signed-off-by: Chris Chiu <chiu(a)endlessm.com> --- sound/pci/hda/patch_realtek.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 737ef82a75fd..dfb4bca07d3f 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6149,6 +6149,7 @@ enum { ALC236_FIXUP_HP_MUTE_LED, ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET, ALC295_FIXUP_ASUS_MIC_NO_PRESENCE, + ALC269VC_FIXUP_ACER_VCOPPERBOX_PINS, }; static const struct hda_fixup alc269_fixups[] = { @@ -7327,6 +7328,17 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id = ALC269_FIXUP_HEADSET_MODE }, + [ALC269VC_FIXUP_ACER_VCOPPERBOX_PINS] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl[]) { + { 0x14, 0x90100120 }, /* use as internal speaker */ + { 0x18, 0x02a111f0 }, /* use as headset mic, without its own jack detect */ + { 0x1a, 0x01011020 }, /* use as line out */ + { }, + }, + .chained = true, + .chain_id = ALC269_FIXUP_HEADSET_MODE + }, }; static const struct snd_pci_quirk alc269_fixup_tbl[] = { @@ -7346,6 +7358,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1025, 0x1099, "Acer Aspire E5-523G", ALC255_FIXUP_ACER_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1025, 0x110e, "Acer Aspire ES1-432", ALC255_FIXUP_ACER_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1025, 0x1246, "Acer Predator Helios 500", ALC299_FIXUP_PREDATOR_SPK), + SND_PCI_QUIRK(0x1025, 0x1247, "Acer vCopperbox", ALC269VC_FIXUP_ACER_VCOPPERBOX_PINS), SND_PCI_QUIRK(0x1025, 0x128f, "Acer Veriton Z6860G", ALC286_FIXUP_ACER_AIO_HEADSET_MIC), SND_PCI_QUIRK(0x1025, 0x1290, "Acer Veriton Z4860G", ALC286_FIXUP_ACER_AIO_HEADSET_MIC), SND_PCI_QUIRK(0x1025, 0x1291, "Acer Veriton Z4660G", ALC286_FIXUP_ACER_AIO_HEADSET_MIC), -- 2.27.0

2 3

[PATCH] ASoC: cros_ec_codec: Log results when EC commands fail
by Yu-Hsuan Hsu 03 Jul '20

03 Jul '20

Log results of failed EC commands to identify a problem more easily. Signed-off-by: Yu-Hsuan Hsu <yuhsuan(a)chromium.org> --- sound/soc/codecs/cros_ec_codec.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/cros_ec_codec.c b/sound/soc/codecs/cros_ec_codec.c index 8d45c628e988e..a4ab62f59efa6 100644 --- a/sound/soc/codecs/cros_ec_codec.c +++ b/sound/soc/codecs/cros_ec_codec.c @@ -90,10 +90,17 @@ static int send_ec_host_command(struct cros_ec_device *ec_dev, uint32_t cmd, if (outsize) memcpy(msg->data, out, outsize); - ret = cros_ec_cmd_xfer_status(ec_dev, msg); + ret = cros_ec_cmd_xfer(ec_dev, msg); if (ret < 0) goto error; + if (msg->result != EC_RES_SUCCESS) { + dev_err(ec_dev->dev, "Command %d failed: %d\n", cmd, + msg->result); + ret = -EPROTO; + goto error; + } + if (insize) memcpy(in, msg->data, insize); -- 2.27.0.212.ge8ba1cc988-goog

2 1

alsa-lib: ctl: improve documentation for identifier of control element
by GitHub pull_request - opened 03 Jul '20

03 Jul '20

alsa-project/alsa-lib pull request #66 was opened from takaswie: In documentation, there are two ways relevant to the identifier of control element. However, the case of combination has the lack of parameters. This commit improves documentation in this point. Fixes: f3c24de8c0df ("ctl: add an overview for design of ALSA control interface") Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> Request URL : https://github.com/alsa-project/alsa-lib/pull/66 Patch URL : https://github.com/alsa-project/alsa-lib/pull/66.patch Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[PATCH] ASoC: dt-bindings: simple-card: Fix 'make dt_binding_check' warnings
by Fabio Estevam 03 Jul '20

03 Jul '20

The following build warnings are seen with 'make dt_binding_check': Documentation/devicetree/bindings/sound/simple-card.example.dts:209.46-211.15: Warning (unit_address_vs_reg): /example-4/sound/simple-audio-card,cpu@0: node has a unit name, but no reg or ranges property Documentation/devicetree/bindings/sound/simple-card.example.dts:213.37-215.15: Warning (unit_address_vs_reg): /example-4/sound/simple-audio-card,cpu@1: node has a unit name, but no reg or ranges property Documentation/devicetree/bindings/sound/simple-card.example.dts:250.42-261.15: Warning (unit_address_vs_reg): /example-5/sound/simple-audio-card,dai-link@0: node has a unit name, but no reg or ranges property Documentation/devicetree/bindings/sound/simple-card.example.dts:263.42-288.15: Warning (unit_address_vs_reg): /example-5/sound/simple-audio-card,dai-link@1: node has a unit name, but no reg or ranges property Documentation/devicetree/bindings/sound/simple-card.example.dts:270.32-272.19: Warning (unit_address_vs_reg): /example-5/sound/simple-audio-card,dai-link@1/cpu@0: node has a unit name, but no reg or ranges property Documentation/devicetree/bindings/sound/simple-card.example.dts:273.23-275.19: Warning (unit_address_vs_reg): /example-5/sound/simple-audio-card,dai-link@1/cpu@1: node has a unit name, but no reg or ranges property Documentation/devicetree/bindings/sound/simple-card.example.dts:276.23-278.19: Warning (unit_address_vs_reg): /example-5/sound/simple-audio-card,dai-link@1/cpu@2: node has a unit name, but no reg or ranges property Documentation/devicetree/bindings/sound/simple-card.example.dts:279.23-281.19: Warning (unit_address_vs_reg): /example-5/sound/simple-audio-card,dai-link@1/cpu@3: node has a unit name, but no reg or ranges property Documentation/devicetree/bindings/sound/simple-card.example.dts:290.42-303.15: Warning (unit_address_vs_reg): /example-5/sound/simple-audio-card,dai-link@2: node has a unit name, but no reg or ranges property Fix them all. Signed-off-by: Fabio Estevam <festevam(a)gmail.com> --- .../devicetree/bindings/sound/simple-card.yaml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/simple-card.yaml b/Documentation/devicetree/bindings/sound/simple-card.yaml index 8132d0c0f00a..35e669020296 100644 --- a/Documentation/devicetree/bindings/sound/simple-card.yaml +++ b/Documentation/devicetree/bindings/sound/simple-card.yaml @@ -378,6 +378,8 @@ examples: - | sound { compatible = "simple-audio-card"; + #address-cells = <1>; + #size-cells = <0>; simple-audio-card,name = "rsnd-ak4643"; simple-audio-card,format = "left_j"; @@ -391,10 +393,12 @@ examples: "ak4642 Playback", "DAI1 Playback"; dpcmcpu: simple-audio-card,cpu@0 { + reg = <0>; sound-dai = <&rcar_sound 0>; }; simple-audio-card,cpu@1 { + reg = <1>; sound-dai = <&rcar_sound 1>; }; @@ -418,6 +422,8 @@ examples: - | sound { compatible = "simple-audio-card"; + #address-cells = <1>; + #size-cells = <0>; simple-audio-card,routing = "pcm3168a Playback", "DAI1 Playback", @@ -426,6 +432,7 @@ examples: "pcm3168a Playback", "DAI4 Playback"; simple-audio-card,dai-link@0 { + reg = <0>; format = "left_j"; bitclock-master = <&sndcpu0>; frame-master = <&sndcpu0>; @@ -439,22 +446,23 @@ examples: }; simple-audio-card,dai-link@1 { + reg = <1>; format = "i2s"; bitclock-master = <&sndcpu1>; frame-master = <&sndcpu1>; convert-channels = <8>; /* TDM Split */ - sndcpu1: cpu@0 { + sndcpu1: cpu0 { sound-dai = <&rcar_sound 1>; }; - cpu@1 { + cpu1 { sound-dai = <&rcar_sound 2>; }; - cpu@2 { + cpu2 { sound-dai = <&rcar_sound 3>; }; - cpu@3 { + cpu3 { sound-dai = <&rcar_sound 4>; }; codec { @@ -466,6 +474,7 @@ examples: }; simple-audio-card,dai-link@2 { + reg = <2>; format = "i2s"; bitclock-master = <&sndcpu2>; frame-master = <&sndcpu2>; -- 2.17.1

4 6

[PATCH 0/6] ASoC: fsl: fix kernel-doc
by Pierre-Louis Bossart 02 Jul '20

02 Jul '20

This cleanup patchset is only about kernel-doc, mostly trivial edits and format correction. Pierre-Louis Bossart (6): ASoC: fsl: fsl_ssi_dbg: remove spurious kernel-doc comment start ASoC: fsl: fsl_ssi: fix kernel-doc ASoC: fsl: fsl-asoc-card: fix kernel-doc ASoC: fsl: fsl_spdif: fix kernel-doc ASoC: fsl: fsl_asrc: fix kernel-doc ASoC: fsl: fsl_esai: fix kernel-doc sound/soc/fsl/fsl-asoc-card.c | 21 +++++------ sound/soc/fsl/fsl_asrc.c | 57 +++++++++++++++++++--------- sound/soc/fsl/fsl_esai.c | 32 +++++++++------- sound/soc/fsl/fsl_spdif.c | 5 ++- sound/soc/fsl/fsl_ssi.c | 70 ++++++++++++++++++++++------------- sound/soc/fsl/fsl_ssi_dbg.c | 4 +- 6 files changed, 115 insertions(+), 74 deletions(-) -- 2.25.1

2 14

[PATCH 0/7] ASoC: codecs: wm/cs: fix kernel-doc and W=1 warnings
by Pierre-Louis Bossart 02 Jul '20

02 Jul '20

I've been doing a lot of cleanups to get to zero warnings with W=1, here's the first batch for Cirrus/Wolfson codecs. Pierre-Louis Bossart (7): ASoC: codecs: cs4270: fix kernel-doc ASoC: codecs: cs42l42: remove always-true comparisons ASoC: codecs: wm8986: fix missing kernel-doc arguments ASoC: codecs: wm8960: fix kernel-doc ASoC: codecs: wm9713: remove spurious kernel-doc comment start ASoC: codecs: wm8994: fix kernel-doc ASoC: codecs: wm8400: add _maybe_unused as needed sound/soc/codecs/cs4270.c | 4 ++-- sound/soc/codecs/cs42l42.c | 9 +++------ sound/soc/codecs/wm8400.c | 6 +++--- sound/soc/codecs/wm8960.c | 2 +- sound/soc/codecs/wm8994.c | 4 ++++ sound/soc/codecs/wm8996.c | 3 +++ sound/soc/codecs/wm9713.c | 2 +- 7 files changed, 17 insertions(+), 13 deletions(-) base-commit: a2b782d59c57cb6f673dbb4804ffc500336d7a54 -- 2.25.1

3 14

[PATCH alsa-lib 1/8] topology: decode: fix channel map memory allocation
by Piotr Maziarz 02 Jul '20

02 Jul '20

Without proper memory allocation behaviour was undefined. Signed-off-by: Piotr Maziarz <piotrx.maziarz(a)linux.intel.com> --- src/topology/ctl.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/topology/ctl.c b/src/topology/ctl.c index 90241b6..c8c7e94 100644 --- a/src/topology/ctl.c +++ b/src/topology/ctl.c @@ -1330,7 +1330,6 @@ int tplg_decode_control_enum1(snd_tplg_t *tplg, void *bin, size_t size) { struct snd_soc_tplg_enum_control *ec = bin; - struct snd_tplg_channel_map_template cmt; int i; if (size < sizeof(*ec)) { @@ -1375,11 +1374,11 @@ int tplg_decode_control_enum1(snd_tplg_t *tplg, } } - et->map = &cmt; - memset(&cmt, 0, sizeof(cmt)); - cmt.num_channels = ec->num_channels; - for (i = 0; i < cmt.num_channels; i++) { - struct snd_tplg_channel_elem *channel = &cmt.channel[i]; + et->map = tplg_calloc(heap, sizeof(struct snd_tplg_channel_map_template)); + et->map->num_channels = ec->num_channels; + for (i = 0; i < et->map->num_channels; i++) { + struct snd_tplg_channel_elem *channel = &et->map->channel[i]; + tplg_log(tplg, 'D', pos + ((void *)&ec->channel[i] - (void *)ec), "enum: channel size %d", ec->channel[i].size); channel->reg = ec->channel[i].reg; -- 2.7.4

2 11

Re: [PATCH] riscv: asm/gdb_xml.h: use __maybe_used to make W=1 warnings go away
by Pierre-Louis Bossart 02 Jul '20

02 Jul '20

On 7/1/20 9:04 PM, Vincent Chen wrote: > On Thu, Jul 2, 2020 at 2:48 AM Pierre-Louis Bossart > <pierre-louis.bossart(a)linux.intel.com> wrote: >> >> 0day/kbuild reports warnings with the ASoC codecs compiled with W=1. >> >> In file included from arch/riscv/include/asm/kgdb.h:109, >> from include/linux/kgdb.h:20, >> from include/linux/fb.h:5, >> from include/drm/drm_crtc.h:31, >> from sound/soc/codecs/hdmi-codec.c:19: >> >> arch/riscv/include/asm/gdb_xml.h:23:19: warning: >> 'riscv_gdb_stub_cpuxml' defined but not used [-Wunused-const-variable=] >> 23 | static const char riscv_gdb_stub_cpuxml[2048] = >> | ^~~~~~~~~~~~~~~~~~~~~ >> arch/riscv/include/asm/gdb_xml.h:16:19: warning: >> 'riscv_gdb_stub_target_desc' defined but not used [-Wunused-const-variable=] >> 16 | static const char riscv_gdb_stub_target_desc[256] = >> | ^~~~~~~~~~~~~~~~~~~~~~~~~~ >> arch/riscv/include/asm/gdb_xml.h:13:19: warning: >> 'gdb_xfer_read_cpuxml' defined but not used [-Wunused-const-variable=] >> 13 | static const char gdb_xfer_read_cpuxml[39] = >> | ^~~~~~~~~~~~~~~~~~~~ >> arch/riscv/include/asm/gdb_xml.h:10:19: warning: >> 'gdb_xfer_read_target' defined but not used [-Wunused-const-variable=] >> 10 | static const char gdb_xfer_read_target[31] = "qXfer:features:read:target.xml:"; >> | ^~~~~~~~~~~~~~~~~~~~ >> arch/riscv/include/asm/gdb_xml.h:7:19: warning: >> 'riscv_gdb_stub_feature' defined but not used [-Wunused-const-variable=] >> 7 | static const char riscv_gdb_stub_feature[64] = >> | ^~~~~~~~~~~~~~~~~~~~~~ >> >> Reported-by: kernel test robot <lkp(a)intel.com> >> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> >> --- >> >> I don't know if this is the right way of solving this issue but this >> error is now consistently thrown in kbuild compile-test reports w/ >> W=1. >> > > Dear Pierre-Louis Bossart: > Thanks for your modifications. I have fixed the warnings in my latest > KGDB patchset and sent it out, but the merged KGDB patchset is not my > latest version. > I have sent a patch set to complement the missing ports, and I think > these warnings would disappear after this patch has been accepted and > merged. > > Here is the patch to fix this warning: > http://lists.infradead.org/pipermail/linux-riscv/2020-June/000660.html Thank you Vincent, let's drop my hacky patch then.

1 0

[PATCH] ASoC: dt-bindings: simple-card: care missing address #address-cells
by Kuninori Morimoto 02 Jul '20

02 Jul '20

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Current simple-card will get below error, because it doesn't care about #address-cells at some part. DTC Documentation/devicetree/bindings/sound/simple-card.example.dt.yaml Documentation/devicetree/bindings/sound/simple-card.example.dts:171.46-173.15: \ Warning (unit_address_vs_reg): /example-4/sound/simple-audio-card,cpu@0: \ node has a unit name, but no reg or ranges property Documentation/devicetree/bindings/sound/simple-card.example.dts:175.37-177.15: \ Warning (unit_address_vs_reg): /example-4/sound/simple-audio-card,cpu@1: \ node has a unit name, but no reg or ranges property ... This patch fixup this issue. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- .../bindings/sound/simple-card.yaml | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/simple-card.yaml b/Documentation/devicetree/bindings/sound/simple-card.yaml index cb2bb5fac0e1..6c4c2c6d6d3c 100644 --- a/Documentation/devicetree/bindings/sound/simple-card.yaml +++ b/Documentation/devicetree/bindings/sound/simple-card.yaml @@ -208,6 +208,11 @@ patternProperties: reg: maxItems: 1 + "#address-cells": + const: 1 + "#size-cells": + const: 0 + # common properties frame-master: $ref: "#/definitions/frame-master" @@ -288,7 +293,6 @@ examples: #address-cells = <1>; #size-cells = <0>; - simple-audio-card,dai-link@0 { /* I2S - HDMI */ reg = <0>; format = "i2s"; @@ -392,11 +396,15 @@ examples: simple-audio-card,routing = "ak4642 Playback", "DAI0 Playback", "ak4642 Playback", "DAI1 Playback"; + #address-cells = <1>; + #size-cells = <0>; dpcmcpu: simple-audio-card,cpu@0 { + reg = <0>; sound-dai = <&rcar_sound 0>; }; simple-audio-card,cpu@1 { + reg = <1>; sound-dai = <&rcar_sound 1>; }; @@ -427,7 +435,12 @@ examples: "pcm3168a Playback", "DAI3 Playback", "pcm3168a Playback", "DAI4 Playback"; + #address-cells = <1>; + #size-cells = <0>; + simple-audio-card,dai-link@0 { + reg = <0>; + format = "left_j"; bitclock-master = <&sndcpu0>; frame-master = <&sndcpu0>; @@ -441,22 +454,30 @@ examples: }; simple-audio-card,dai-link@1 { + reg = <1>; + format = "i2s"; bitclock-master = <&sndcpu1>; frame-master = <&sndcpu1>; convert-channels = <8>; /* TDM Split */ + #address-cells = <1>; + #size-cells = <0>; sndcpu1: cpu@0 { + reg = <0>; sound-dai = <&rcar_sound 1>; }; cpu@1 { + reg = <1>; sound-dai = <&rcar_sound 2>; }; cpu@2 { + reg = <2>; sound-dai = <&rcar_sound 3>; }; cpu@3 { + reg = <3>; sound-dai = <&rcar_sound 4>; }; codec { @@ -468,6 +489,8 @@ examples: }; simple-audio-card,dai-link@2 { + reg = <2>; + format = "i2s"; bitclock-master = <&sndcpu2>; frame-master = <&sndcpu2>; -- 2.17.1

2 3