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

[PATCH AUTOSEL 5.9 098/111] ASoC: SOF: Add topology filename override based on dmi data match
by Sasha Levin 18 Oct '20

18 Oct '20

From: Sathyanarayana Nujella <sathyanarayana.nujella(a)intel.com> [ Upstream commit 5253a73d567dcd75e62834ff5f502ea9470e5722 ] Add topology filename override based on system DMI data matching, typically to account for a different hardware layout. In ACPI based systems, the tplg_filename is pre-defined in an ACPI machine table. When a DMI quirk is detected, the sof_pdata->tplg_filename is not set with the hard-coded ACPI value, and instead is set with the DMI-specific filename. Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski(a)linux.intel.com> Signed-off-by: Sathyanarayana Nujella <sathyanarayana.nujella(a)intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Link: https://lore.kernel.org/r/20200821195603.215535-14-pierre-louis.bossart@lin… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/sof/intel/hda.c | 8 +++++++- sound/soc/sof/sof-pci-dev.c | 24 ++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index 63ca920c8e6e0..7152e6d1cf673 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -1179,7 +1179,13 @@ void hda_machine_select(struct snd_sof_dev *sdev) mach = snd_soc_acpi_find_machine(desc->machines); if (mach) { - sof_pdata->tplg_filename = mach->sof_tplg_filename; + /* + * If tplg file name is overridden, use it instead of + * the one set in mach table + */ + if (!sof_pdata->tplg_filename) + sof_pdata->tplg_filename = mach->sof_tplg_filename; + sof_pdata->machine = mach; if (mach->link_mask) { diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c index aa3532ba14349..f3a8140773db5 100644 --- a/sound/soc/sof/sof-pci-dev.c +++ b/sound/soc/sof/sof-pci-dev.c @@ -35,8 +35,28 @@ static int sof_pci_debug; module_param_named(sof_pci_debug, sof_pci_debug, int, 0444); MODULE_PARM_DESC(sof_pci_debug, "SOF PCI debug options (0x0 all off)"); +static const char *sof_override_tplg_name; + #define SOF_PCI_DISABLE_PM_RUNTIME BIT(0) +static int sof_tplg_cb(const struct dmi_system_id *id) +{ + sof_override_tplg_name = id->driver_data; + return 1; +} + +static const struct dmi_system_id sof_tplg_table[] = { + { + .callback = sof_tplg_cb, + .matches = { + DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Volteer"), + DMI_MATCH(DMI_PRODUCT_NAME, "Terrador"), + }, + .driver_data = "sof-tgl-rt5682-ssp0-max98373-ssp2.tplg", + }, + {} +}; + static const struct dmi_system_id community_key_platforms[] = { { .ident = "Up Squared", @@ -347,6 +367,10 @@ static int sof_pci_probe(struct pci_dev *pci, sof_pdata->tplg_filename_prefix = sof_pdata->desc->default_tplg_path; + dmi_check_system(sof_tplg_table); + if (sof_override_tplg_name) + sof_pdata->tplg_filename = sof_override_tplg_name; + #if IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE) /* set callback to enable runtime_pm */ sof_pdata->sof_probe_complete = sof_pci_probe_complete; -- 2.25.1

1 0

[PATCH AUTOSEL 5.9 097/111] ALSA: hda/ca0132 - Add new quirk ID for SoundBlaster AE-7.
by Sasha Levin 18 Oct '20

18 Oct '20

From: Connor McAdams <conmanx360(a)gmail.com> [ Upstream commit 620f08eea6d6961b789af3fa3ea86725c8c93ece ] Add a new PCI subsystem ID for the SoundBlaster AE-7 card. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Link: https://lore.kernel.org/r/20200825201040.30339-11-conmanx360@gmail.com Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/pci/hda/patch_ca0132.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index c68669911de0a..a3eecdf9185e8 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -1065,6 +1065,7 @@ enum { QUIRK_R3DI, QUIRK_R3D, QUIRK_AE5, + QUIRK_AE7, }; #ifdef CONFIG_PCI @@ -1184,6 +1185,7 @@ static const struct snd_pci_quirk ca0132_quirks[] = { SND_PCI_QUIRK(0x1102, 0x0013, "Recon3D", QUIRK_R3D), SND_PCI_QUIRK(0x1102, 0x0018, "Recon3D", QUIRK_R3D), SND_PCI_QUIRK(0x1102, 0x0051, "Sound Blaster AE-5", QUIRK_AE5), + SND_PCI_QUIRK(0x1102, 0x0081, "Sound Blaster AE-7", QUIRK_AE7), {} }; -- 2.25.1

1 0

[PATCH AUTOSEL 5.9 096/111] ALSA: hda/ca0132 - Add AE-7 microphone selection commands.
by Sasha Levin 18 Oct '20

18 Oct '20

From: Connor McAdams <conmanx360(a)gmail.com> [ Upstream commit ed93f9750c6c2ed371347d0aac3dcd31cb9cf256 ] Add AE-7 quirk data for setting of microphone. The AE-7 has no front panel connector, so only rear-mic/line-in have new commands. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Link: https://lore.kernel.org/r/20200825201040.30339-19-conmanx360@gmail.com Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/pci/hda/patch_ca0132.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index b7dbf2e7f77af..c68669911de0a 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -4675,6 +4675,15 @@ static int ca0132_alt_select_in(struct hda_codec *codec) ca0113_mmio_command_set(codec, 0x30, 0x28, 0x00); tmp = FLOAT_THREE; break; + case QUIRK_AE7: + ca0113_mmio_command_set(codec, 0x30, 0x28, 0x00); + tmp = FLOAT_THREE; + chipio_set_conn_rate(codec, MEM_CONNID_MICIN2, + SR_96_000); + chipio_set_conn_rate(codec, MEM_CONNID_MICOUT2, + SR_96_000); + dspio_set_uint_param(codec, 0x80, 0x01, FLOAT_ZERO); + break; default: tmp = FLOAT_ONE; break; @@ -4720,6 +4729,14 @@ static int ca0132_alt_select_in(struct hda_codec *codec) case QUIRK_AE5: ca0113_mmio_command_set(codec, 0x30, 0x28, 0x00); break; + case QUIRK_AE7: + ca0113_mmio_command_set(codec, 0x30, 0x28, 0x3f); + chipio_set_conn_rate(codec, MEM_CONNID_MICIN2, + SR_96_000); + chipio_set_conn_rate(codec, MEM_CONNID_MICOUT2, + SR_96_000); + dspio_set_uint_param(codec, 0x80, 0x01, FLOAT_ZERO); + break; default: break; } @@ -4729,7 +4746,10 @@ static int ca0132_alt_select_in(struct hda_codec *codec) if (ca0132_quirk(spec) == QUIRK_R3DI) chipio_set_conn_rate(codec, 0x0F, SR_96_000); - tmp = FLOAT_ZERO; + if (ca0132_quirk(spec) == QUIRK_AE7) + tmp = FLOAT_THREE; + else + tmp = FLOAT_ZERO; dspio_set_uint_param(codec, 0x80, 0x00, tmp); switch (ca0132_quirk(spec)) { -- 2.25.1

1 0

dcef48f "add support for AMD acp microphone devices" can break pulseaudio
by GitHub issues - opened 18 Oct '20

18 Oct '20

alsa-project/alsa-ucm-conf issue #54 was opened from danielrparks: I recently upgraded alsa-ucm-conf from 1.2.3 to 1.2.4 on Arch Linux, and now pulseaudio fails to initialize my sound card. This system is a Dell Inspiron 7405 with a Ryzen 7 4700U and a Realtek ALC3204 sound card. The microphone is handled by the audio co-processor. Pulseaudio generates the following error: ``` Failed to find a working profile. Failed to load module "module-alsa-card" (argument: "device_id="1" name="pci-0000_03_00.6" card_name="alsa_card.pci-0000_03_00.6" namereg_fail=false tsched=yes fixed_latency_range=no ignore_dB=no deferred_volume=yes use_ucm=yes avoid_resampling=no card_properties="module-udev-detect.discovered=1""): initialization failed. ``` [notworking-journal.txt](https://github.com/alsa-project/alsa-ucm-conf/files… [working-pacmd-list-sinks.txt](https://github.com/alsa-project/alsa-ucm-conf… I did a git bisect and got this: ``` dcef48f13d4f5db79b006755074940b94730a883 is the first bad commit commit dcef48f13d4f5db79b006755074940b94730a883 Author: Jaroslav Kysela <perex(a)perex.cz> Date: Wed Jun 24 13:39:07 2020 +0200 HDA-Intel: add support for AMD acp microphone devices - move the generic HDA code from sof-hda-dsp to HDA-Intel - add generic codecs/hda/hdmi.conf Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> ucm2/HDA-Intel/HDA-Capture-value.conf | 4 + ucm2/HDA-Intel/HDA-Intel.conf | 28 +++++++ ucm2/HDA-Intel/Hdmi.conf | 37 +++++++++ ucm2/HDA-Intel/HiFi-acp.conf | 8 ++ ucm2/HDA-Intel/HiFi-analog.conf | 133 +++++++++++++++++++++++++++++++ ucm2/HDA-Intel/HiFi.conf | 32 ++++++++ ucm2/HDA-Intel/init.conf | 39 +++++++++ ucm2/codecs/hda/hdmi.conf | 25 ++++++ ucm2/module/lib/linked.conf | 3 + ucm2/module/snd_acp3x_rn.conf | 1 + ucm2/sof-hda-dsp/HDA-Capture-value.conf | 4 - ucm2/sof-hda-dsp/Hdmi.conf | 78 +++++------------- ucm2/sof-hda-dsp/HiFi.conf | 135 +------------------------------- 13 files changed, 331 insertions(+), 196 deletions(-) create mode 100644 ucm2/HDA-Intel/HDA-Capture-value.conf create mode 100644 ucm2/HDA-Intel/HDA-Intel.conf create mode 100644 ucm2/HDA-Intel/Hdmi.conf create mode 100644 ucm2/HDA-Intel/HiFi-acp.conf create mode 100644 ucm2/HDA-Intel/HiFi-analog.conf create mode 100644 ucm2/HDA-Intel/HiFi.conf create mode 100644 ucm2/HDA-Intel/init.conf create mode 100644 ucm2/codecs/hda/hdmi.conf create mode 100644 ucm2/module/lib/linked.conf create mode 120000 ucm2/module/snd_acp3x_rn.conf delete mode 100644 ucm2/sof-hda-dsp/HDA-Capture-value.conf ``` Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/54 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Add Slovak translation
by GitHub pull_request - opened 18 Oct '20

18 Oct '20

alsa-project/alsa-utils pull request #68 was opened from jose1711: Request URL : https://github.com/alsa-project/alsa-utils/pull/68 Patch URL : https://github.com/alsa-project/alsa-utils/pull/68.patch Repository URL: https://github.com/alsa-project/alsa-utils

1 0

Add amixer --view, to filter playback, capture or all
by GitHub issues - edited 18 Oct '20

18 Oct '20

alsa-project/alsa-utils issue #67 was edited from jidanni: alsamixer has ``` -V, --view <mode> Select the starting view mode, either playback, capture or all. ``` Perhaps amixer could also have something similar, e.g., so that ``` $ amixer --view capture ``` would only dump the capture related settings. Currently one could say that ``` $ amixer --view all ``` is the default. Issue URL : https://github.com/alsa-project/alsa-utils/issues/67 Repository URL: https://github.com/alsa-project/alsa-utils

1 0

Add amixer --view, to filter playback, capture or all
by GitHub issues - opened 18 Oct '20

18 Oct '20

alsa-project/alsa-utils issue #67 was opened from jidanni: alsamixer has ``` -V, --view <mode> Select the starting view mode, either playback, capture or all. ``` Perhaps amixer could also have something similar,' e.g., so that ``` $ amixer --view capture ``` would only dump the capture related settings. Currently one could say that ``` $ amixer --view all ``` is the default. Issue URL : https://github.com/alsa-project/alsa-utils/issues/67 Repository URL: https://github.com/alsa-project/alsa-utils

1 0

Fix grammar mess.
by GitHub pull_request - opened 18 Oct '20

18 Oct '20

alsa-project/alsa-utils pull request #66 was opened from jidanni: Fix grammar mess. Request URL : https://github.com/alsa-project/alsa-utils/pull/66 Patch URL : https://github.com/alsa-project/alsa-utils/pull/66.patch Repository URL: https://github.com/alsa-project/alsa-utils

1 0

arecord/aplay man page should separate the options into three lists…
by GitHub issues - edited 18 Oct '20

18 Oct '20

alsa-project/alsa-utils issue #65 was edited from jidanni: The arecord/aplay man page should perhaps separate the options into three lists 1. ones that affect recording, 2. ones that affect playing, 2. and ones that affect both. Issue URL : https://github.com/alsa-project/alsa-utils/issues/65 Repository URL: https://github.com/alsa-project/alsa-utils

1 0

arecord/aplay man page should separate the options into three lists…
by GitHub issues - opened 18 Oct '20

18 Oct '20

alsa-project/alsa-utils issue #65 was opened from jidanni: The arecord/aplay man page should perhaps separate the options into three lists, ones that affect recording, ones that affect playing, and ones that affect both. Issue URL : https://github.com/alsa-project/alsa-utils/issues/65 Repository URL: https://github.com/alsa-project/alsa-utils

1 0