August 2019 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH AUTOSEL 5.2 014/123] ASoC: samsung: odroid: fix a double-free issue for cpu_dai
by Sasha Levin 14 Aug '19

14 Aug '19

From: Wen Yang <wen.yang99(a)zte.com.cn> [ Upstream commit 2abee12c0ab1924a69993d2c063a39a952e7d836 ] The cpu_dai variable is still being used after the of_node_put() call, which may result in double-free: of_node_put(cpu_dai); ---> released here ret = devm_snd_soc_register_card(dev, card); if (ret < 0) { ... goto err_put_clk_i2s; --> jump to err_put_clk_i2s ... err_put_clk_i2s: clk_put(priv->clk_i2s_bus); err_put_sclk: clk_put(priv->sclk_i2s); err_put_cpu_dai: of_node_put(cpu_dai); --> double-free here Fixes: d832d2b246c5 ("ASoC: samsung: odroid: Fix of_node refcount unbalance") Signed-off-by: Wen Yang <wen.yang99(a)zte.com.cn> Cc: Krzysztof Kozlowski <krzk(a)kernel.org> Cc: Sangbeom Kim <sbkim73(a)samsung.com> Cc: Sylwester Nawrocki <s.nawrocki(a)samsung.com> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: alsa-devel(a)alsa-project.org Cc: linux-kernel(a)vger.kernel.org Link: https://lore.kernel.org/r/1562989575-33785-3-git-send-email-wen.yang99@zte.… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/samsung/odroid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/samsung/odroid.c b/sound/soc/samsung/odroid.c index 95c35e3ff3303..d606e48fe551a 100644 --- a/sound/soc/samsung/odroid.c +++ b/sound/soc/samsung/odroid.c @@ -299,7 +299,6 @@ static int odroid_audio_probe(struct platform_device *pdev) ret = PTR_ERR(priv->clk_i2s_bus); goto err_put_sclk; } - of_node_put(cpu_dai); ret = devm_snd_soc_register_card(dev, card); if (ret < 0) { @@ -307,6 +306,7 @@ static int odroid_audio_probe(struct platform_device *pdev) goto err_put_clk_i2s; } + of_node_put(cpu_dai); of_node_put(codec); return 0; -- 2.20.1

1 0

[alsa-devel] [PATCH AUTOSEL 5.2 013/123] ASoC: samsung: odroid: fix an use-after-free issue for codec
by Sasha Levin 14 Aug '19

14 Aug '19

From: Wen Yang <wen.yang99(a)zte.com.cn> [ Upstream commit 9b6d104a6b150bd4d3e5b039340e1f6b20c2e3c1 ] The codec variable is still being used after the of_node_put() call, which may result in use-after-free. Fixes: bc3cf17b575a ("ASoC: samsung: odroid: Add support for secondary CPU DAI") Signed-off-by: Wen Yang <wen.yang99(a)zte.com.cn> Cc: Krzysztof Kozlowski <krzk(a)kernel.org> Cc: Sangbeom Kim <sbkim73(a)samsung.com> Cc: Sylwester Nawrocki <s.nawrocki(a)samsung.com> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: alsa-devel(a)alsa-project.org Cc: linux-kernel(a)vger.kernel.org Link: https://lore.kernel.org/r/1562989575-33785-2-git-send-email-wen.yang99@zte.… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/samsung/odroid.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/samsung/odroid.c b/sound/soc/samsung/odroid.c index e688169ff12ab..95c35e3ff3303 100644 --- a/sound/soc/samsung/odroid.c +++ b/sound/soc/samsung/odroid.c @@ -275,9 +275,8 @@ static int odroid_audio_probe(struct platform_device *pdev) } of_node_put(cpu); - of_node_put(codec); if (ret < 0) - return ret; + goto err_put_node; ret = snd_soc_of_get_dai_link_codecs(dev, codec, codec_link); if (ret < 0) @@ -308,6 +307,7 @@ static int odroid_audio_probe(struct platform_device *pdev) goto err_put_clk_i2s; } + of_node_put(codec); return 0; err_put_clk_i2s: @@ -317,6 +317,8 @@ static int odroid_audio_probe(struct platform_device *pdev) err_put_cpu_dai: of_node_put(cpu_dai); snd_soc_of_put_dai_link_codecs(codec_link); +err_put_node: + of_node_put(codec); return ret; } -- 2.20.1

1 0

[alsa-devel] Sound Blaster RX does not play sound in side channels
by GitHub issues - opened 13 Aug '19

13 Aug '19

alsa-project/alsa-lib issue #9 was opened from logan001: I don't have the card anymore but maybe someone else have it and can provide some help cause i like the card bass/treble control and if the bug is fixed i will buy it. The card does not output side channels at all. 5.1 works but 7.1 side channels gives no sound with speaker-test -c 8 pulseaudio also gives no sound for side channels in speaker tests. i don't know if its the right place to report this bug but i've tried on kernel bugzilla and there is no movement there. the kernels i've tried 1 month ago are 4.18 and 5.1.15 here is the [alsainfo](https://bugzilla.kernel.org/attachment.cgi?id=283467) at that time what i found strange is that alsamixer when i change the sound card had the side channels volume set at 0. its like by default was build intentionally without side channels support. and yes i have that special cable with 3 jacks (sound card) to 4 jack (for speakers). i have it from an old audigy 2 zs if i remeber corectly. and the cable works since i tested 7.1 in windows without any issues. Issue URL : https://github.com/alsa-project/alsa-lib/issues/9 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[alsa-devel] [PATCH -next] ALSA: hda/sigmatel - remove unused variable 'stac9200_core_init'
by YueHaibing 13 Aug '19

13 Aug '19

sound/pci/hda/patch_sigmatel.c:981:30: warning: stac9200_core_init defined but not used [-Wunused-const-variable=] It is never used, so can be removed. Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> --- sound/pci/hda/patch_sigmatel.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 0d9b627..894f3f5 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -975,15 +975,6 @@ static int stac_create_spdif_mux_ctls(struct hda_codec *codec) return 0; } -/* - */ - -static const struct hda_verb stac9200_core_init[] = { - /* set dac0mux for dac converter */ - { 0x07, AC_VERB_SET_CONNECT_SEL, 0x00}, - {} -}; - static const struct hda_verb stac9200_eapd_init[] = { /* set dac0mux for dac converter */ {0x07, AC_VERB_SET_CONNECT_SEL, 0x00}, -- 2.7.4

2 1

[alsa-devel] [PATCH] ALSA: hda/realtek - Add quirk for HP Envy x360
by Takashi Iwai 13 Aug '19

13 Aug '19

HP Envy x360 (AMD Ryzen-based model) with 103c:8497 needs the same quirk like HP Spectre x360 for enabling the mute LED over Mic3 pin. BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=204373 Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index de224cbea7a0..8aaf1d9c55cf 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6987,6 +6987,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x103c, 0x82bf, "HP G3 mini", ALC221_FIXUP_HP_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x103c, 0x82c0, "HP G3 mini premium", ALC221_FIXUP_HP_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x103c, 0x83b9, "HP Spectre x360", ALC269_FIXUP_HP_MUTE_LED_MIC3), + SND_PCI_QUIRK(0x103c, 0x8497, "HP Envy x360", ALC269_FIXUP_HP_MUTE_LED_MIC3), SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC), SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300), SND_PCI_QUIRK(0x1043, 0x106d, "Asus K53BE", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), -- 2.16.4

1 0

[alsa-devel] Regression in next with codec unload and snd_soc_component_get/put
by Tony Lindgren 13 Aug '19

13 Aug '19

Hi, Looks like commit 4a81e8f30d0b ("ASoC: soc-component: add snd_soc_component_get/put()") causes a regression where trying to rmmod a codec driver fails with module is in use error after rmmod of snd-soc-audio-graph-card for example. Any ideas what goes wrong there? BTW, looks like the lore.kernel.org link in that commit also is unreachable? Regards, Tony

4 6

[alsa-devel] [PATCH 00/11] JZ4740 SoC cleanup
by Paul Cercueil 13 Aug '19

13 Aug '19

Hi, This patchset converts the Qi LB60 MIPS board to devicetree and makes it use all the shiny new drivers that have been developed or updated recently. All the crappy old drivers and custom code can be dropped since they have been replaced by better alternatives. Some of these alternatives are not yet in 5.3-rc1 but have already been accepted by their respective maintainer for inclusion in 5.4-rc1. To upstream this patchset, I think that as soon as MIPS maintainers agree to take patches 01-03/11 and 11/11, the other patches can go through their respective maintainer's tree. Note for MIPS maintainers: Patch 11/11 may conflict with the TCU patchset v15, should this one be accepted upstream, but the conflict is tiny and easy to fix. Should this case appear, don't hesitate to bother me about it. Thanks, -Paul

12 38

[alsa-devel] [asoc:for-5.4 195/232] sound/soc/sof/intel/hda-dsp.c:360:22: error: 'hlink' undeclared
by kbuild test robot 12 Aug '19

12 Aug '19

Hi Mark, FYI, the error/warning still remains. tree: https://kernel.googlesource.com/pub/scm/linux/kernel/git/broonie/sound.git for-5.4 head: 6fa4e0cae684d268d309d1b1f929d52e3df5649c commit: c2f16a94a80497e4b28c27f9ca2cd6cd60706fb6 [195/232] Merge branch 'topic/hda-bus-ops-cleanup' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound into asoc-5.4 config: x86_64-randconfig-s0-08121238 (attached as .config) compiler: gcc-7 (Debian 7.4.0-10) 7.4.0 reproduce: git checkout c2f16a94a80497e4b28c27f9ca2cd6cd60706fb6 # save the attached .config to linux build tree make ARCH=x86_64 If you fix the issue, kindly add following tag Reported-by: kbuild test robot <lkp(a)intel.com> All errors (new ones prefixed by >>): In file included from include/linux/kobject.h:19:0, from include/linux/device.h:16, from include/sound/hdaudio.h:9, from include/sound/hdaudio_ext.h:5, from sound/soc/sof/intel/hda-dsp.c:18: sound/soc/sof/intel/hda-dsp.c: In function 'hda_resume': >> sound/soc/sof/intel/hda-dsp.c:360:22: error: 'hlink' undeclared (first use in this function) list_for_each_entry(hlink, &bus->hlink_list, list) ^ include/linux/list.h:577:7: note: in definition of macro 'list_for_each_entry' for (pos = list_first_entry(head, typeof(*pos), member); \ ^~~ sound/soc/sof/intel/hda-dsp.c:360:22: note: each undeclared identifier is reported only once for each function it appears in list_for_each_entry(hlink, &bus->hlink_list, list) ^ include/linux/list.h:577:7: note: in definition of macro 'list_for_each_entry' for (pos = list_first_entry(head, typeof(*pos), member); \ ^~~ In file included from include/linux/list.h:9:0, from include/linux/kobject.h:19, from include/linux/device.h:16, from include/sound/hdaudio.h:9, from include/sound/hdaudio_ext.h:5, from sound/soc/sof/intel/hda-dsp.c:18: >> sound/soc/sof/intel/hda-dsp.c:360:30: error: 'bus' undeclared (first use in this function) list_for_each_entry(hlink, &bus->hlink_list, list) ^ include/linux/kernel.h:972:26: note: in definition of macro 'container_of' void *__mptr = (void *)(ptr); \ ^~~ include/linux/list.h:490:2: note: in expansion of macro 'list_entry' list_entry((ptr)->next, type, member) ^~~~~~~~~~ include/linux/list.h:577:13: note: in expansion of macro 'list_first_entry' for (pos = list_first_entry(head, typeof(*pos), member); \ ^~~~~~~~~~~~~~~~ sound/soc/sof/intel/hda-dsp.c:360:2: note: in expansion of macro 'list_for_each_entry' list_for_each_entry(hlink, &bus->hlink_list, list) ^~~~~~~~~~~~~~~~~~~ >> sound/soc/sof/intel/hda-dsp.c:364:2: error: #else without #if #else ^~~~ >> sound/soc/sof/intel/hda-dsp.c:390:2: error: #endif without #if #endif ^~~~~ vim +/hlink +360 sound/soc/sof/intel/hda-dsp.c 747503b1813a3e Liam Girdwood 2019-04-12 334 fd15f2f5e27214 Rander Wang 2019-07-22 335 static int hda_resume(struct snd_sof_dev *sdev, bool runtime_resume) 747503b1813a3e Liam Girdwood 2019-04-12 336 { 747503b1813a3e Liam Girdwood 2019-04-12 337 #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) 747503b1813a3e Liam Girdwood 2019-04-12 338 struct hdac_bus *bus = sof_to_bus(sdev); 747503b1813a3e Liam Girdwood 2019-04-12 339 struct hdac_ext_link *hlink = NULL; 747503b1813a3e Liam Girdwood 2019-04-12 340 #endif 747503b1813a3e Liam Girdwood 2019-04-12 341 int ret; 747503b1813a3e Liam Girdwood 2019-04-12 342 747503b1813a3e Liam Girdwood 2019-04-12 343 /* 747503b1813a3e Liam Girdwood 2019-04-12 344 * clear TCSEL to clear playback on some HD Audio 747503b1813a3e Liam Girdwood 2019-04-12 345 * codecs. PCI TCSEL is defined in the Intel manuals. 747503b1813a3e Liam Girdwood 2019-04-12 346 */ 747503b1813a3e Liam Girdwood 2019-04-12 347 snd_sof_pci_update_bits(sdev, PCI_TCSEL, 0x07, 0); 747503b1813a3e Liam Girdwood 2019-04-12 348 747503b1813a3e Liam Girdwood 2019-04-12 349 /* reset and start hda controller */ 747503b1813a3e Liam Girdwood 2019-04-12 350 ret = hda_dsp_ctrl_init_chip(sdev, true); 747503b1813a3e Liam Girdwood 2019-04-12 351 if (ret < 0) { 747503b1813a3e Liam Girdwood 2019-04-12 352 dev_err(sdev->dev, 747503b1813a3e Liam Girdwood 2019-04-12 353 "error: failed to start controller after resume\n"); 747503b1813a3e Liam Girdwood 2019-04-12 354 return ret; 747503b1813a3e Liam Girdwood 2019-04-12 355 } 747503b1813a3e Liam Girdwood 2019-04-12 356 747503b1813a3e Liam Girdwood 2019-04-12 357 hda_dsp_ctrl_misc_clock_gating(sdev, false); 747503b1813a3e Liam Girdwood 2019-04-12 358 747503b1813a3e Liam Girdwood 2019-04-12 359 /* Reset stream-to-link mapping */ 747503b1813a3e Liam Girdwood 2019-04-12 @360 list_for_each_entry(hlink, &bus->hlink_list, list) 19abfefd4c7604 Takashi Iwai 2019-08-07 361 writel(0, hlink->ml_addr + AZX_REG_ML_LOSIDV); 747503b1813a3e Liam Girdwood 2019-04-12 362 747503b1813a3e Liam Girdwood 2019-04-12 363 hda_dsp_ctrl_misc_clock_gating(sdev, true); 747503b1813a3e Liam Girdwood 2019-04-12 @364 #else 747503b1813a3e Liam Girdwood 2019-04-12 365 747503b1813a3e Liam Girdwood 2019-04-12 366 hda_dsp_ctrl_misc_clock_gating(sdev, false); 747503b1813a3e Liam Girdwood 2019-04-12 367 747503b1813a3e Liam Girdwood 2019-04-12 368 /* reset controller */ 747503b1813a3e Liam Girdwood 2019-04-12 369 ret = hda_dsp_ctrl_link_reset(sdev, true); 747503b1813a3e Liam Girdwood 2019-04-12 370 if (ret < 0) { 747503b1813a3e Liam Girdwood 2019-04-12 371 dev_err(sdev->dev, 747503b1813a3e Liam Girdwood 2019-04-12 372 "error: failed to reset controller during resume\n"); 747503b1813a3e Liam Girdwood 2019-04-12 373 return ret; 747503b1813a3e Liam Girdwood 2019-04-12 374 } 747503b1813a3e Liam Girdwood 2019-04-12 375 747503b1813a3e Liam Girdwood 2019-04-12 376 /* take controller out of reset */ 747503b1813a3e Liam Girdwood 2019-04-12 377 ret = hda_dsp_ctrl_link_reset(sdev, false); 747503b1813a3e Liam Girdwood 2019-04-12 378 if (ret < 0) { 747503b1813a3e Liam Girdwood 2019-04-12 379 dev_err(sdev->dev, 747503b1813a3e Liam Girdwood 2019-04-12 380 "error: failed to ready controller during resume\n"); 747503b1813a3e Liam Girdwood 2019-04-12 381 return ret; 747503b1813a3e Liam Girdwood 2019-04-12 382 } 747503b1813a3e Liam Girdwood 2019-04-12 383 747503b1813a3e Liam Girdwood 2019-04-12 384 /* enable hda bus irq */ 747503b1813a3e Liam Girdwood 2019-04-12 385 snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, SOF_HDA_INTCTL, 747503b1813a3e Liam Girdwood 2019-04-12 386 SOF_HDA_INT_CTRL_EN | SOF_HDA_INT_GLOBAL_EN, 747503b1813a3e Liam Girdwood 2019-04-12 387 SOF_HDA_INT_CTRL_EN | SOF_HDA_INT_GLOBAL_EN); 747503b1813a3e Liam Girdwood 2019-04-12 388 747503b1813a3e Liam Girdwood 2019-04-12 389 hda_dsp_ctrl_misc_clock_gating(sdev, true); 24b6ff686fce80 Zhu Yingjiang 2019-06-12 @390 #endif 747503b1813a3e Liam Girdwood 2019-04-12 391 747503b1813a3e Liam Girdwood 2019-04-12 392 /* enable ppcap interrupt */ 747503b1813a3e Liam Girdwood 2019-04-12 393 hda_dsp_ctrl_ppcap_enable(sdev, true); 747503b1813a3e Liam Girdwood 2019-04-12 394 hda_dsp_ctrl_ppcap_int_enable(sdev, true); 747503b1813a3e Liam Girdwood 2019-04-12 395 :::::: The code at line 360 was first introduced by commit :::::: 747503b1813a3e6e4c52d9c0b4bd462b64940940 ASoC: SOF: Intel: Add Intel specific HDA DSP HW operations :::::: TO: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> :::::: CC: Mark Brown <broonie(a)kernel.org> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

2 1

[alsa-devel] [PATCH] ASoC: SOF: Intel: hda: fixup HDaudio topology name with DMIC number
by Pierre-Louis Bossart 12 Aug '19

12 Aug '19

The SOF project maintains 6 topologies for HDaudio (iDisp or HDaudio+iDisp, no DMIC, 2 DMICs, 4 DMICs). The user is currently required to manually rename the topology file used in /lib/firmware/intel/sof-tplg. We can do better to avoid such renames and use logic to select the relevant file. The NHLT information can be used to figure out which topology file should be used. Alternatively, when NHLT is not present in ACPI tables or is possibly incorrect, a module parameter can provide that information, e.g. on Up^2 board with the test DMIC kit. Tested on Up^2 board and Acer Swift-SF314-55 Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/sof/intel/Kconfig | 1 + sound/soc/sof/intel/hda.c | 75 +++++++++++++++++++++++++++++++------ 2 files changed, 64 insertions(+), 12 deletions(-) diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig index dd14ce92fe10..545071afbe18 100644 --- a/sound/soc/sof/intel/Kconfig +++ b/sound/soc/sof/intel/Kconfig @@ -254,6 +254,7 @@ config SND_SOC_SOF_HDA tristate select SND_HDA_EXT_CORE if SND_SOC_SOF_HDA_LINK select SND_SOC_HDAC_HDA if SND_SOC_SOF_HDA_AUDIO_CODEC + select SND_INTEL_NHLT help This option is not user-selectable but automagically handled by 'select' statements at a higher level diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index ebf277754901..c72e9a09eee1 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -19,6 +19,7 @@ #include <sound/hda_register.h> #include <linux/module.h> +#include <sound/intel-nhlt.h> #include <sound/sof.h> #include <sound/sof/xtensa.h> #include "../ops.h" @@ -49,6 +50,12 @@ module_param_named(use_msi, hda_use_msi, bool, 0444); MODULE_PARM_DESC(use_msi, "SOF HDA use PCI MSI mode"); #endif +#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) +static int hda_dmic_num = -1; +module_param_named(dmic_num, hda_dmic_num, int, 0444); +MODULE_PARM_DESC(dmic_num, "SOF HDA DMIC number"); +#endif + static const struct hda_dsp_msg_code hda_dsp_rom_msg[] = { {HDA_DSP_ROM_FW_MANIFEST_LOADED, "status: manifest loaded"}, {HDA_DSP_ROM_FW_FW_LOADED, "status: fw loaded"}, @@ -283,8 +290,26 @@ static int hda_init(struct snd_sof_dev *sdev) #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) +static int check_nhlt_dmic(struct snd_sof_dev *sdev) +{ + struct nhlt_acpi_table *nhlt; + int dmic_num; + + nhlt = intel_nhlt_init(sdev->dev); + if (nhlt) { + dmic_num = intel_nhlt_get_dmic_geo(sdev->dev, nhlt); + intel_nhlt_free(nhlt); + if (dmic_num == 2 || dmic_num == 4) + return dmic_num; + } + + return 0; +} + static const char *fixup_tplg_name(struct snd_sof_dev *sdev, - const char *sof_tplg_filename) + const char *sof_tplg_filename, + const char *idisp_str, + const char *dmic_str) { const char *tplg_filename = NULL; char *filename; @@ -298,7 +323,8 @@ static const char *fixup_tplg_name(struct snd_sof_dev *sdev, split_ext = strsep(&filename, "."); if (split_ext) { tplg_filename = devm_kasprintf(sdev->dev, GFP_KERNEL, - "%s-idisp.tplg", split_ext); + "%s%s%s.tplg", + split_ext, idisp_str, dmic_str); if (!tplg_filename) return NULL; } @@ -317,6 +343,9 @@ static int hda_init_caps(struct snd_sof_dev *sdev) struct snd_sof_pdata *pdata = sdev->pdata; struct snd_soc_acpi_mach *mach; const char *tplg_filename; + const char *idisp_str; + const char *dmic_str; + int dmic_num; int codec_num = 0; int i; #endif @@ -387,17 +416,39 @@ static int hda_init_caps(struct snd_sof_dev *sdev) dev_info(bus->dev, "using HDA machine driver %s now\n", hda_mach->drv_name); - /* fixup topology file for HDMI only platforms */ - if (codec_num == 1) { - /* use local variable for readability */ - tplg_filename = pdata->tplg_filename; - tplg_filename = fixup_tplg_name(sdev, tplg_filename); - if (!tplg_filename) { - hda_codec_i915_exit(sdev); - return ret; - } - pdata->tplg_filename = tplg_filename; + if (codec_num == 1) + idisp_str = "-idisp"; + else + idisp_str = ""; + + /* first check NHLT for DMICs */ + dmic_num = check_nhlt_dmic(sdev); + + /* allow for module parameter override */ + if (hda_dmic_num != -1) + dmic_num = hda_dmic_num; + + switch (dmic_num) { + case 2: + dmic_str = "-2ch"; + break; + case 4: + dmic_str = "-4ch"; + break; + default: + dmic_num = 0; + dmic_str = ""; + break; + } + + tplg_filename = pdata->tplg_filename; + tplg_filename = fixup_tplg_name(sdev, tplg_filename, + idisp_str, dmic_str); + if (!tplg_filename) { + hda_codec_i915_exit(sdev); + return ret; } + pdata->tplg_filename = tplg_filename; } } -- 2.20.1

2 1

[alsa-devel] asound snd_pcm_start question
by Eric Desjardins 12 Aug '19

12 Aug '19

Hi, This is a simple question. I call: snd_pcm_prepare snd_pcm_writei and it works fine but I would like to delay playback start. There is snd_pcm_start for that. There is a method that is deprecated to specify a start mode but I was wondering what was the correct new way to do that? Thanks, Eric

2 1