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

[PATCH] ASoC: wm_adsp: Let soc_cleanup_component_debugfs remove debugfs
by Lucas Tanure 29 Jul '21

29 Jul '21

soc_cleanup_component_debugfs will debugfs_remove_recursive the component->debugfs_root, so adsp doesn't need to also remove the same entry. By doing that adsp also creates a race with core component, which causes a NULL pointer dereference Signed-off-by: Lucas Tanure <tanureal(a)opensource.cirrus.com> --- sound/soc/codecs/wm_adsp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index b395df1eb72d..bbe27ab3b1fc 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -747,7 +747,6 @@ static void wm_adsp2_init_debugfs(struct wm_adsp *dsp, static void wm_adsp2_cleanup_debugfs(struct wm_adsp *dsp) { wm_adsp_debugfs_clear(dsp); - debugfs_remove_recursive(dsp->debugfs_root); } #else static inline void wm_adsp2_init_debugfs(struct wm_adsp *dsp, -- 2.32.0

2 1

[PATCH] ASoC: component: Remove misplaced prefix handling in pin control functions
by Mark Brown 29 Jul '21

29 Jul '21

When the component level pin control functions were added they for some no longer obvious reason handled adding prefixing of widget names. This meant that when the lack of prefix handling in the DAPM level pin operations was fixed by ae4fc532244b3bb4d (ASoC: dapm: use component prefix when checking widget names) the one device using the component level API ended up with the prefix being applied twice, causing all lookups to fail. Fix this by removing the redundant prefixing from the component code, which has the nice side effect of also making that code much simpler. Reported-by: Richard Fitzgerald <rf(a)opensource.cirrus.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/soc-component.c | 63 +++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 36 deletions(-) diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c index 3a5e84e16a87..c8dfd0de30e4 100644 --- a/sound/soc/soc-component.c +++ b/sound/soc/soc-component.c @@ -148,86 +148,75 @@ int snd_soc_component_set_bias_level(struct snd_soc_component *component, return soc_component_ret(component, ret); } -static int soc_component_pin(struct snd_soc_component *component, - const char *pin, - int (*pin_func)(struct snd_soc_dapm_context *dapm, - const char *pin)) -{ - struct snd_soc_dapm_context *dapm = - snd_soc_component_get_dapm(component); - char *full_name; - int ret; - - if (!component->name_prefix) { - ret = pin_func(dapm, pin); - goto end; - } - - full_name = kasprintf(GFP_KERNEL, "%s %s", component->name_prefix, pin); - if (!full_name) { - ret = -ENOMEM; - goto end; - } - - ret = pin_func(dapm, full_name); - kfree(full_name); -end: - return soc_component_ret(component, ret); -} - int snd_soc_component_enable_pin(struct snd_soc_component *component, const char *pin) { - return soc_component_pin(component, pin, snd_soc_dapm_enable_pin); + struct snd_soc_dapm_context *dapm = + snd_soc_component_get_dapm(component); + return snd_soc_dapm_enable_pin(dapm, pin); } EXPORT_SYMBOL_GPL(snd_soc_component_enable_pin); int snd_soc_component_enable_pin_unlocked(struct snd_soc_component *component, const char *pin) { - return soc_component_pin(component, pin, snd_soc_dapm_enable_pin_unlocked); + struct snd_soc_dapm_context *dapm = + snd_soc_component_get_dapm(component); + return snd_soc_dapm_enable_pin_unlocked(dapm, pin); } EXPORT_SYMBOL_GPL(snd_soc_component_enable_pin_unlocked); int snd_soc_component_disable_pin(struct snd_soc_component *component, const char *pin) { - return soc_component_pin(component, pin, snd_soc_dapm_disable_pin); + struct snd_soc_dapm_context *dapm = + snd_soc_component_get_dapm(component); + return snd_soc_dapm_disable_pin(dapm, pin); } EXPORT_SYMBOL_GPL(snd_soc_component_disable_pin); int snd_soc_component_disable_pin_unlocked(struct snd_soc_component *component, const char *pin) { - return soc_component_pin(component, pin, snd_soc_dapm_disable_pin_unlocked); + struct snd_soc_dapm_context *dapm = + snd_soc_component_get_dapm(component); + return snd_soc_dapm_disable_pin_unlocked(dapm, pin); } EXPORT_SYMBOL_GPL(snd_soc_component_disable_pin_unlocked); int snd_soc_component_nc_pin(struct snd_soc_component *component, const char *pin) { - return soc_component_pin(component, pin, snd_soc_dapm_nc_pin); + struct snd_soc_dapm_context *dapm = + snd_soc_component_get_dapm(component); + return snd_soc_dapm_nc_pin(dapm, pin); } EXPORT_SYMBOL_GPL(snd_soc_component_nc_pin); int snd_soc_component_nc_pin_unlocked(struct snd_soc_component *component, const char *pin) { - return soc_component_pin(component, pin, snd_soc_dapm_nc_pin_unlocked); + struct snd_soc_dapm_context *dapm = + snd_soc_component_get_dapm(component); + return snd_soc_dapm_nc_pin_unlocked(dapm, pin); } EXPORT_SYMBOL_GPL(snd_soc_component_nc_pin_unlocked); int snd_soc_component_get_pin_status(struct snd_soc_component *component, const char *pin) { - return soc_component_pin(component, pin, snd_soc_dapm_get_pin_status); + struct snd_soc_dapm_context *dapm = + snd_soc_component_get_dapm(component); + return snd_soc_dapm_get_pin_status(dapm, pin); } EXPORT_SYMBOL_GPL(snd_soc_component_get_pin_status); int snd_soc_component_force_enable_pin(struct snd_soc_component *component, const char *pin) { - return soc_component_pin(component, pin, snd_soc_dapm_force_enable_pin); + struct snd_soc_dapm_context *dapm = + snd_soc_component_get_dapm(component); + return snd_soc_dapm_force_enable_pin(dapm, pin); } EXPORT_SYMBOL_GPL(snd_soc_component_force_enable_pin); @@ -235,7 +224,9 @@ int snd_soc_component_force_enable_pin_unlocked( struct snd_soc_component *component, const char *pin) { - return soc_component_pin(component, pin, snd_soc_dapm_force_enable_pin_unlocked); + struct snd_soc_dapm_context *dapm = + snd_soc_component_get_dapm(component); + return snd_soc_dapm_force_enable_pin_unlocked(dapm, pin); } EXPORT_SYMBOL_GPL(snd_soc_component_force_enable_pin_unlocked); -- 2.20.1

2 2

[PATCH] ASoC: Intel: Fix spelling contraction "cant" -> "can't"
by Colin King 29 Jul '21

29 Jul '21

From: Colin Ian King <colin.king(a)canonical.com> There is a spelling mistake in a dev_err message. Fix it. Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/soc/intel/atom/sst/sst_ipc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/atom/sst/sst_ipc.c b/sound/soc/intel/atom/sst/sst_ipc.c index a8a9aa0057d3..4e8382097e61 100644 --- a/sound/soc/intel/atom/sst/sst_ipc.c +++ b/sound/soc/intel/atom/sst/sst_ipc.c @@ -128,7 +128,7 @@ int sst_post_message_mrfld(struct intel_sst_drv *sst_drv_ctx, while (header.p.header_high.part.busy) { if (loop_count > 25) { dev_err(sst_drv_ctx->dev, - "sst: Busy wait failed, cant send this msg\n"); + "sst: Busy wait failed, can't send this msg\n"); retval = -EBUSY; goto out; } -- 2.31.1

3 2

[PATCH] MAINTAINERS: Add sound devicetree bindings for Wolfson Micro devices
by Richard Fitzgerald 29 Jul '21

29 Jul '21

Include all wm* sound bindings in the section for Wolfson Micro drivers. This section already includes the actual driver source files. Also update the existing entry to match all wlf,* sound bindings. Signed-off-by: Richard Fitzgerald <rf(a)opensource.cirrus.com> --- MAINTAINERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 19135a9d778e..d8282bb8a7e1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -20009,7 +20009,8 @@ F: Documentation/devicetree/bindings/extcon/wlf,arizona.yaml F: Documentation/devicetree/bindings/mfd/wlf,arizona.yaml F: Documentation/devicetree/bindings/mfd/wm831x.txt F: Documentation/devicetree/bindings/regulator/wlf,arizona.yaml -F: Documentation/devicetree/bindings/sound/wlf,arizona.yaml +F: Documentation/devicetree/bindings/sound/wlf,*.yaml +F: Documentation/devicetree/bindings/sound/wm* F: Documentation/hwmon/wm83??.rst F: arch/arm/mach-s3c/mach-crag6410* F: drivers/clk/clk-wm83*.c -- 2.11.0

2 1

[PATCH] ASoC: bcm: cygnus-pcm: Fix unused assignment about 'rc'
by Tang Bin 29 Jul '21

29 Jul '21

Delete unused initialized value of 'rc', because it will be assigned by the function devm_request_irq(). Signed-off-by: Zhang Shengju <zhangshengju(a)cmss.chinamobile.com> Signed-off-by: Tang Bin <tangbin(a)cmss.chinamobile.com> --- sound/soc/bcm/cygnus-pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/bcm/cygnus-pcm.c b/sound/soc/bcm/cygnus-pcm.c index 7ad07239f..039365f76 100644 --- a/sound/soc/bcm/cygnus-pcm.c +++ b/sound/soc/bcm/cygnus-pcm.c @@ -830,7 +830,7 @@ static struct snd_soc_component_driver cygnus_soc_platform = { int cygnus_soc_platform_register(struct device *dev, struct cygnus_audio *cygaud) { - int rc = 0; + int rc; dev_dbg(dev, "%s Enter\n", __func__); -- 2.20.1.windows.1

2 1

[PATCH 0/7] ALSA/ASoC/SOF/SoundWire: fix Kconfig issues
by Pierre-Louis Bossart 28 Jul '21

28 Jul '21

In January, Intel kbuild bot and Arnd Bergmann reported multiple issues with randconfig. This patchset builds on Arnd's suggestions to a) expose ACPI and PCI devices in separate modules, while sof-acpi-dev and sof-pci-dev become helpers. This will result in minor changes required for developers/testers, i.e. modprobe snd-sof-pci will no longer result in a probe. The SOF CI was already updated to deal with this module dependency change and introduction of new modules. b) Fix SOF/SoundWire/DSP_config dependencies by moving the code required to detect SoundWire presence in ACPI tables to sound/hda. Integration note: This patchset touches directories maintained by Vinod, Takashi and Mark in separate trees, and will impact additional changes to use the auxiliary bus in drivers/soundwire/. I can think of two options, both of which are fine: 1. Mark merges the patches with Vinod and Takashi Acked-by tags, then Mark provides an immutable tag to Vinod. 2. Vinod merges the patches with Mark and Takashi Acked-by tags, then Vinod provides an immutable tag to Mark Acknowledgements: Thanks to Arnd for suggesting fixes and testing these patches with more randconfigs. Thanks to Vinod Koul for his feedback on the move of this common helper to sound/hda/ Arnd Bergmann (1): ASoC: SOF: ACPI: avoid reverse module dependency Pierre-Louis Bossart (6): ASoC: soc-acpi: allow for partial match in parent name ASoC: SOF: pci: split PCI into different drivers ASoC: SOF: pci: move DSP_CONFIG use to platform-specific drivers ASoC: SOF: Intel: SoundWire: simplify Kconfig ALSA: hda: move Intel SoundWire ACPI scan to dedicated module ALSA: hda: intel-sdw-acpi: add missing include files drivers/soundwire/intel.h | 2 - drivers/soundwire/intel_init.c | 158 ------------- include/linux/soundwire/sdw_intel.h | 2 + include/sound/soc-acpi.h | 2 +- sound/hda/Kconfig | 4 + sound/hda/Makefile | 3 + sound/hda/intel-dsp-config.c | 2 +- sound/hda/intel-sdw-acpi.c | 179 +++++++++++++++ sound/soc/sof/Kconfig | 15 +- sound/soc/sof/Makefile | 4 +- sound/soc/sof/intel/Kconfig | 254 +++++++-------------- sound/soc/sof/intel/Makefile | 20 +- sound/soc/sof/intel/bdw.c | 67 +++++- sound/soc/sof/intel/byt.c | 106 ++++++++- sound/soc/sof/intel/hda.c | 18 ++ sound/soc/sof/intel/hda.h | 3 + sound/soc/sof/intel/pci-apl.c | 81 +++++++ sound/soc/sof/intel/pci-cnl.c | 104 +++++++++ sound/soc/sof/intel/pci-icl.c | 84 +++++++ sound/soc/sof/intel/pci-tgl.c | 121 ++++++++++ sound/soc/sof/intel/pci-tng.c | 70 ++++++ sound/soc/sof/intel/shim.h | 6 - sound/soc/sof/sof-acpi-dev.c | 130 +---------- sound/soc/sof/sof-acpi-dev.h | 16 ++ sound/soc/sof/sof-pci-dev.c | 340 +--------------------------- sound/soc/sof/sof-pci-dev.h | 17 ++ 26 files changed, 998 insertions(+), 810 deletions(-) create mode 100644 sound/hda/intel-sdw-acpi.c create mode 100644 sound/soc/sof/intel/pci-apl.c create mode 100644 sound/soc/sof/intel/pci-cnl.c create mode 100644 sound/soc/sof/intel/pci-icl.c create mode 100644 sound/soc/sof/intel/pci-tgl.c create mode 100644 sound/soc/sof/intel/pci-tng.c create mode 100644 sound/soc/sof/sof-acpi-dev.h create mode 100644 sound/soc/sof/sof-pci-dev.h -- 2.25.1

5 20

PCM prepare callback
by Muni Sekhar 28 Jul '21

28 Jul '21

Hi all, Is there any document which explains the sequence of snd_pcm_ops callbacks called during playback and capture? What driver is supposed to return from the PCM prepare callback if the sound card is not ready for playback\capture? -- Thanks, Sekhar

1 0

Copy hw out to loop problem when recording started before playing
by Anton Nikolaev 28 Jul '21

28 Jul '21

Hello everyone. Please help. Do not understand what is wrong Chains is : Plug asym1 - Out= Plug with multi (Copy hardware dmix output to dmix loopout) IN= Dsnoop with hardware dev Plug asym2 - Out= plug dmix loop IN= plug dsnoop loop Work good if playing to plug asym1 started before recording from asym2. Not working play to asym1 if recording from asym2 started before playing to asym1. /Etc/asound.conf is: pcm.hwcard0 { type hw; card 0; device 0; } pcm.!default { type plug; slave.pcm { type asym; playback.pcm "devhwcopy"; capture.pcm "devhwin"; } } pcm.devhwcopy { type plug; route_policy "duplicate"; slave.pcm { type multi; slaves { a { channels 2; pcm "devhwout"; } b { channels 2; pcm "devloopout"; } } bindings { 0 { slave a channel 0 } 1 { slave a channel 1 } 2 { slave b channel 0 } 3 { slave b channel 1 } } } ttable [ [ 1 0 1 0 ] [ 0 1 0 1 ] ] } pcm.devhwout { type dmix; ipc_key 1024001; ipc_perm 0666; hw_ptr_alignment roundup; slave { pcm "hwcard0"; channels 2; period_size 1024; buffer_size 8192; } bindings { 0 0 1 1 } } pcm.devhwin { type dsnoop; ipc_key 1024002; ipc_perm 0666; slave { pcm "hwcard0"; channels 2; rate 44100; period_size 1024; buffer_size 8192; } bindings { 0 0 1 1 } } pcm.devloopout { type dmix; ipc_key 1024011; ipc_perm 0666; slave { pcm "hw:LOOPCARD,0,0"; channels 2; period_size 1024; buffer_size 8192; } bindings { 0 0 1 1 } } pcm.devloopin { type dsnoop; ipc_key 1024012; ipc_perm 0666; slave { pcm "hw:LOOPCARD,1,0"; channels 2; rate 44100; period_size 1024; buffer_size 8192; } bindings { 0 0 1 1 } } pcm.devloop { type plug; slave.pcm { type asym; playback.pcm "devloopout"; capture.pcm "devloopin"; } } (English is not native for me, sorry)

1 0

[PATCH 0/5] ASoC: soc-pcm: cleanup cppcheck warning
by Kuninori Morimoto 28 Jul '21

28 Jul '21

Hi Mark Now I'm posting audio-graph-card2 patch-set, but it seems it needs longer discussion. Thus I want to post more easy patch first, and reduce my local patches. These are cppcheck warning cleanup patches for soc-pcm. Kuninori Morimoto (5): ASoC: soc-pcm: cleanup cppcheck warning at soc_pcm_apply_msb() ASoC: soc-pcm: cleanup cppcheck warning at soc_pcm_components_close() ASoC: soc-pcm: cleanup cppcheck warning at soc_get_playback_capture() ASoC: soc-pcm: cleanup cppcheck warning at dpcm_be_is_active() ASoC: soc-pcm: cleanup cppcheck warning at dpcm_runtime_setup_be_chan() sound/soc/soc-pcm.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) -- 2.25.1 Thank you for your help !! Best regards --- Kuninori Morimoto

3 8

Pulseaudio dropping GPU audio
by Liam Hupfer 27 Jul '21

27 Jul '21

Hello, I’ve set up a Linux VM where I’m passing through an RX 580. I’m using the GPU audio and my monitor’s audio jack. For some reason the Linux VM keeps losing track of the audio output. It always shows up under `lspci' under ID `06:00.0' using the `snd_hda_intel' driver, but `pulseaudio' (I also tried `pipewire', same issue) keep losing it. Most times I can restart `pulseaudio' and it will find the device again; occasionally, it takes multiple restarts. I checked the Arch wiki and I found something[¹] on audio over HDMI (I’m using DisplayPort, if that matters). I checked the device and it did report `Enable+'. Even so, I added the kernel parameter `snd_hda_intel.enable_msi=1', but nothing changed. Here are some `journalctl --user -u pulseaudio' logs: ┌──── │ 20:37:31 host pulseaudio[2373]: ALSA woke us up to write new data to the device, but there was actually nothing to write. │ 20:37:31 host pulseaudio[2373]: Most likely this is a bug in the ALSA driver 'snd_hda_intel'. Please report this issue to the ALSA developers. │ 20:37:31 host pulseaudio[2373]: We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() returned 0 or another value < min_avail. └──── Anyone have any suggestions for troubleshooting? `pulseaudio'’s logs suggested it might have to do with ALSA, so I asked for help here. Thank you! —Liam [¹] <https://wiki.archlinux.org/title/PCI_passthrough_via_OVMF#Slowed_down_audio…>

2 1