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

[PATCH v5 00/12] sound: Use -EPROBE_DEFER instead of i915 module loading.
by Maarten Lankhorst 02 Oct '23

02 Oct '23

Explicitly loading i915 becomes a problem when upstreaming the new intel driver for Tiger Lake and higher graphics (xe). By loading i915, it doesn't wait for driver load of xe, and will fail completely before it loads. -EPROBE_DEFER has to be returned before any device is created in probe(), otherwise the removal of the device will cause EPROBE_DEFER to try again in an infinite loop. The conversion is done in gradual steps. First I add an argument to snd_hdac_i915_init to allow for -EPROBE_DEFER so I can convert each driver separately. Then I convert each driver to move snd_hdac_i915_init out of the workqueue. Finally I drop the ability to choose modprobe behavior after the last user is converted. Compared to previous version, I added a fix for sof_ops_free() missing call, renamed probe_no_wq and remove_no_wq to probe_early/probe_late, and fixed the resulting fallout. Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Cezary Rojewski <cezary.rojewski(a)intel.com> Cc: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Cc: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> Cc: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Cc: Bard Liao <yung-chuan.liao(a)linux.intel.com> Cc: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Cc: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Daniel Baluta <daniel.baluta(a)nxp.com> Cc: alsa-devel(a)alsa-project.org Cc: linux-kernel(a)vger.kernel.org Cc: sound-open-firmware(a)alsa-project.org Maarten Lankhorst (10): ASoC/SOF/core: Ensure sof_ops_free() is still called when probe never ran. ALSA: hda/intel: Fix error handling in azx_probe() ALSA: hda/i915: Allow override of gpu binding. ALSA: hda/i915: Add an allow_modprobe argument to snd_hdac_i915_init ALSA: hda/i915: Allow xe as match for i915_component_master_match ASoC: Intel: avs: Move snd_hdac_i915_init to before probe_work. ALSA: hda/intel: Move snd_hdac_i915_init to before probe_work. ASoC: Intel: Skylake: Move snd_hdac_i915_init to before probe_work. ASoC: SOF: Intel: Move binding to display driver outside of deferred probe ALSA: hda/i915: Remove extra argument from snd_hdac_i915_init Pierre-Louis Bossart (2): ASoC: SOF: core: Add probe_early and remove_late callbacks ASoC: SOF: Intel: hda: start splitting the probe sound/hda/hdac_i915.c | 24 ++++++----- sound/pci/hda/hda_intel.c | 60 ++++++++++++++-------------- sound/soc/intel/avs/core.c | 13 ++++-- sound/soc/intel/skylake/skl.c | 31 +++++--------- sound/soc/sof/core.c | 17 +++++++- sound/soc/sof/intel/hda-common-ops.c | 2 + sound/soc/sof/intel/hda.c | 30 +++++++++----- sound/soc/sof/intel/hda.h | 2 + sound/soc/sof/ops.h | 16 ++++++++ sound/soc/sof/sof-priv.h | 2 + 10 files changed, 119 insertions(+), 78 deletions(-) -- 2.39.2

3 18

[PATCH][next] ASoC: SOF: ipc4-topology: Use size_add() in call to struct_size()
by Gustavo A. R. Silva 02 Oct '23

02 Oct '23

If, for any reason, the open-coded arithmetic causes a wraparound, the protection that `struct_size()` adds against potential integer overflows is defeated. Fix this by hardening call to `struct_size()` with `size_add()`. Fixes: f9efae954905 ("ASoC: SOF: ipc4-topology: Add support for base config extension") Signed-off-by: Gustavo A. R. Silva <gustavoars(a)kernel.org> --- sound/soc/sof/ipc4-topology.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/sof/ipc4-topology.c b/sound/soc/sof/ipc4-topology.c index f2a30cd31378..2a19dd022aaf 100644 --- a/sound/soc/sof/ipc4-topology.c +++ b/sound/soc/sof/ipc4-topology.c @@ -895,7 +895,8 @@ static int sof_ipc4_widget_setup_comp_process(struct snd_sof_widget *swidget) if (process->init_config == SOF_IPC4_MODULE_INIT_CONFIG_TYPE_BASE_CFG_WITH_EXT) { struct sof_ipc4_base_module_cfg_ext *base_cfg_ext; u32 ext_size = struct_size(base_cfg_ext, pin_formats, - swidget->num_input_pins + swidget->num_output_pins); + size_add(swidget->num_input_pins, + swidget->num_output_pins)); base_cfg_ext = kzalloc(ext_size, GFP_KERNEL); if (!base_cfg_ext) { -- 2.34.1

3 7

[PATCH 0/5] GPIO descriptors for TI ASoC codecs
by Linus Walleij 02 Oct '23

02 Oct '23

This cleans up and rewrites the GPIO usage in the TI ASoC components to use GPIO descriptors exclusively. Signed-off-by: Linus Walleij <linus.walleij(a)linaro.org> --- Linus Walleij (5): ASoC: ti: Convert N810 ASoC to GPIO descriptors ASoC: ti: Convert RX51 to use exclusively GPIO descriptors ASoC: ti: Convert TWL4030 to use GPIO descriptors ASoC: ti: Convert Pandora ASoC to GPIO descriptors ASoC: ti: osk5912: Drop unused include arch/arm/mach-omap2/board-n8x0.c | 10 +++++ arch/arm/mach-omap2/pdata-quirks.c | 10 +++++ include/linux/platform_data/omap-twl4030.h | 3 -- sound/soc/ti/n810.c | 31 ++++++++------- sound/soc/ti/omap-twl4030.c | 20 ++++------ sound/soc/ti/omap3pandora.c | 63 +++++++++++------------------- sound/soc/ti/osk5912.c | 1 - sound/soc/ti/rx51.c | 19 ++------- 8 files changed, 72 insertions(+), 85 deletions(-) --- base-commit: 0bb80ecc33a8fb5a682236443c1e740d5c917d1d change-id: 20230922-descriptors-asoc-ti-a852eff479ed Best regards, -- Linus Walleij <linus.walleij(a)linaro.org>

3 9

[PATCH] ASoC: Intel: avs: Remove unused variable
by Amadeusz Sławiński 02 Oct '23

02 Oct '23

Recent commit removed the only user of bus variable in avs_dai_fe_prepare(), also remove the variable itself. Reported-by: kernel test robot <lkp(a)intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202309292121.5DdaNpLj-lkp@intel.com/ Reviewed-by: Cezary Rojewski <cezary.rojewski(a)intel.com> Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> --- sound/soc/intel/avs/pcm.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/soc/intel/avs/pcm.c b/sound/soc/intel/avs/pcm.c index 7b84197bd8b9..5b31203bd56a 100644 --- a/sound/soc/intel/avs/pcm.c +++ b/sound/soc/intel/avs/pcm.c @@ -603,7 +603,6 @@ static int avs_dai_fe_prepare(struct snd_pcm_substream *substream, struct snd_so struct avs_dma_data *data; struct avs_dev *adev = to_avs_dev(dai->dev); struct hdac_ext_stream *host_stream; - struct hdac_bus *bus; unsigned int format_val; int ret; @@ -613,7 +612,6 @@ static int avs_dai_fe_prepare(struct snd_pcm_substream *substream, struct snd_so if (hdac_stream(host_stream)->prepared) return 0; - bus = hdac_stream(host_stream)->bus; snd_hdac_stream_reset(hdac_stream(host_stream)); format_val = snd_hdac_calc_stream_format(runtime->rate, runtime->channels, runtime->format, base-commit: c0a68c96c76dfe139cd89e0b9ec40e25ded8e91d -- 2.34.1

2 1

[PATCH v2] ASoC: hdmi-codec: Fix broken channel map reporting
by Matthias Reichl 02 Oct '23

02 Oct '23

Commit 4e0871333661 ("ASoC: hdmi-codec: fix channel info for compressed formats") accidentally changed hcp->chmap_idx from ca_id, the CEA channel allocation ID, to idx, the index to the table of channel mappings ordered by preference. This resulted in wrong channel maps being reported to userspace, eg for 5.1 "FL,FR,LFE,FC" was reported instead of the expected "FL,FR,LFE,FC,RL,RR": ~ # speaker-test -c 6 -t sine ... 0 - Front Left 3 - Front Center 1 - Front Right 2 - LFE 4 - Unknown 5 - Unknown ~ # amixer cget iface=PCM,name='Playback Channel Map' | grep ': values' : values=3,4,8,7,0,0,0,0 Switch this back to ca_id in case of PCM audio so the correct channel map is reported again and set it to HDMI_CODEC_CHMAP_IDX_UNKNOWN in case of non-PCM audio so the PCM channel map control returns "Unknown" channels (value 0). Fixes: 4e0871333661 ("ASoC: hdmi-codec: fix channel info for compressed formats") Cc: stable(a)vger.kernel.org Signed-off-by: Matthias Reichl <hias(a)horus.com> --- Changes in v2: - Report unknown channel in case of non-pcm audio sound/soc/codecs/hdmi-codec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c index 13689e718d36f..09eef6042aad6 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -531,7 +531,10 @@ static int hdmi_codec_fill_codec_params(struct snd_soc_dai *dai, hp->sample_rate = sample_rate; hp->channels = channels; - hcp->chmap_idx = idx; + if (pcm_audio) + hcp->chmap_idx = ca_id; + else + hcp->chmap_idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN; return 0; } -- 2.39.2

2 1

[PATCH] ASoC: rt5682: Fix regulator enable/disable sequence
by Zhang Shurong 02 Oct '23

02 Oct '23

This will attempt to disable the regulators if the initial enable fails which is a bug. Fix this bug by modifying the code to the correct sequence. Signed-off-by: Zhang Shurong <zhang_shurong(a)foxmail.com> --- sound/soc/codecs/rt5682-i2c.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/rt5682-i2c.c b/sound/soc/codecs/rt5682-i2c.c index b05b4f73d8aa..fbad1ed06626 100644 --- a/sound/soc/codecs/rt5682-i2c.c +++ b/sound/soc/codecs/rt5682-i2c.c @@ -157,11 +157,6 @@ static int rt5682_i2c_probe(struct i2c_client *i2c) return ret; } - ret = devm_add_action_or_reset(&i2c->dev, rt5682_i2c_disable_regulators, - rt5682); - if (ret) - return ret; - ret = regulator_bulk_enable(ARRAY_SIZE(rt5682->supplies), rt5682->supplies); if (ret) { @@ -169,6 +164,11 @@ static int rt5682_i2c_probe(struct i2c_client *i2c) return ret; } + ret = devm_add_action_or_reset(&i2c->dev, rt5682_i2c_disable_regulators, + rt5682); + if (ret) + return ret; + ret = rt5682_get_ldo1(rt5682, &i2c->dev); if (ret) return ret; -- 2.30.2

2 1

[PATCH v4] ASoC: amd: yc: Fix non-functional mic on Lenovo 82YM
by Sven Frotscher 02 Oct '23

02 Oct '23

Like the Lenovo 82TL, 82V2, 82QF and 82UG, the 82YM (Yoga 7 14ARP8) requires an entry in the quirk list to enable the internal microphone. The latter two received similar fixes in commit 1263cc0f414d ("ASoC: amd: yc: Fix non-functional mic on Lenovo 82QF and 82UG"). Fixes: c008323fe361 ("ASoC: amd: yc: Fix a non-functional mic on Lenovo 82SJ") Cc: stable(a)vger.kernel.org Signed-off-by: Sven Frotscher <sven.frotscher(a)gmail.com> --- v3->v4 changes: * re-add blank line between commit message title and body --- v2->v3 changes: * add message title of referenced commit to commit message * make whitespace consistent with surrounding code * use a patch-friendly e-mail client --- v1->v2 changes: * add Fixes and Cc tags to commit message * remove redundant LKML link from commit message * fix mangled diff --- sound/soc/amd/yc/acp6x-mach.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c index 94e9eb8e73f2..15a864dcd7bd 100644 --- a/sound/soc/amd/yc/acp6x-mach.c +++ b/sound/soc/amd/yc/acp6x-mach.c @@ -241,6 +241,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "82V2"), } }, + { + .driver_data = &acp6x_card, + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "82YM"), + } + }, { .driver_data = &acp6x_card, .matches = { -- 2.42.0

4 14

[PATCH] ASoC: fsl-asoc-card: dummy codec compatibility integration for use with S/PDIF controller
by elinor.montmasson＠savoirfairelinux.com 02 Oct '23

02 Oct '23

Hello, Following some work to reduce the impact of audio resampling in Linux, we would like to use the ASRC of the i.MX8 SoCs with the S/PDIF controller. With that aim, this series of patch for the machine driver fsl-asoc-card proposes to add compatibility with the dummy codec driver. This is a first step in using the S/PDIF controller with the ASRC, as the imx-spdif machine driver uses the dummy codec with the fsl_spdif DAI driver. The five first patches add compatibility with the dummy codec through a new compatible, fsl,imx-audio-dummy-codec. Codec parameters are set with default values. The remaining patches add configuration options through device tree for the codec parameters that can also impact the CPU DAI. These are usually hard-coded in fsl-asoc-card for each audio codec. Because this dummy codec could be use with other CPU DAI than the S/PDIF controller, these could need specific configuration. This series of patch was successfully built for arm64 and x86 on top of the latest for-next branch of the ASoC git tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git/ on the 28/08. These modifications have also been tested on an i.MX8MN evaluation board, with a linux kernel RT v6.1.26-rt8. Regards, Elinor Montmasson

3 12

Re: Ryzen 9 7950x sound module does not not build
by Bagas Sanjaya 02 Oct '23

02 Oct '23

[also Cc'ing alsa ML and related maintainers] On Tue, Sep 26, 2023 at 01:23:13PM +0100, Sid Boyce wrote: > I've since rebooted and did a modprobe. No idea why it isn't automatically > loaded. > > #modinfo snd-rpl-pci-acp6x > filename: /usr/lib/modules/6.6.0-rc3-vanilla/kernel/sound/soc/amd/rpl/snd-rpl-pci-acp6x.ko.gz > license: GPL v2 > description: AMD ACP RPL PCI driver > srcversion: 0F909BC61165681426ECEEB > alias: pci:v00001022d000015E2sv*sd*bc04sc80i00* > depends: > retpoline: Y > intree: Y > name: snd_rpl_pci_acp6x > vermagic: 6.6.0-rc3-vanilla SMP preempt mod_unload modversions > > # modprobe snd-rpl-pci-acp6x > > #lsmod|grep snd > snd_rpl_pci_acp6x 16384 0 > snd_seq_dummy 12288 0 > snd_hrtimer 12288 1 > snd_seq 131072 7 snd_seq_dummy > snd_hda_codec_realtek 192512 1 > snd_hda_codec_hdmi 94208 1 > snd_hda_codec_generic 110592 1 snd_hda_codec_realtek > snd_hda_intel 65536 2 > snd_usb_audio 458752 2 > snd_intel_dspcfg 40960 1 snd_hda_intel > snd_intel_sdw_acpi 16384 1 snd_intel_dspcfg > snd_hda_codec 233472 4 > snd_hda_codec_generic,snd_hda_codec_hdmi,snd_hda_intel,snd_hda_codec_realtek > > snd_usbmidi_lib 49152 1 snd_usb_audio > snd_hda_core 147456 5 snd_hda_codec_generic,snd_hda_codec_hdmi,snd_hda_intel,snd_hda_codec,snd_hda_codec_realtek > > snd_ump 36864 1 snd_usb_audio > snd_rawmidi 57344 2 snd_usbmidi_lib,snd_ump > snd_seq_device 16384 3 snd_seq,snd_ump,snd_rawmidi > mc 94208 1 snd_usb_audio > snd_hwdep 20480 2 snd_usb_audio,snd_hda_codec > snd_pcm 225280 6 > snd_hda_codec_hdmi,snd_hda_intel,snd_usb_audio,snd_hda_codec,snd_hda_core > snd_timer 53248 3 snd_seq,snd_hrtimer,snd_pcm > ledtrig_audio 12288 2 snd_hda_codec_generic,asus_wmi > snd 163840 23 snd_hda_codec_generic,snd_seq,snd_seq_device,snd_hda_codec_hdmi,snd_hwdep,snd_hda_intel,snd_usb_audio,snd_usbmidi_lib,snd_hda_codec,snd_hda_codec_realtek,snd_timer,snd_ump,snd_pcm,snd_rawmidi > > soundcore 16384 1 snd > usbcore 446464 6 > xhci_hcd,snd_usb_audio,usbhid,snd_usbmidi_lib,btusb,xhci_pci > Any errors on dmesg when loading snd-rpl-pci-acp6x module? -- An old man doll... just what I always wanted! - Clara

4 10

Re: Hamoa CLO tree access
by Srinivas Kandagatla 02 Oct '23

02 Oct '23

+Adding others maintainers for more thoughts on this. Hi Trilok, On 30/09/2023 18:33, Trilok Soni wrote: > Yes, we should always keep one or more QC Engineers as admin going forward. > We are happy to add users as an when we get a request, till we can figure out a better way to do this. > OR keep it open w/ *(a)quicinc.com <mailto:*@quicinc.com> wild card. > We have to be careful here not to expose a security back door. Am adding other team members to share there opinions. thanks, Srini > ---Trilok Soni > > *From:*Rajendra Nayak (Kernel-BDC) <rjendra(a)qti.qualcomm.com> > *Sent:* Saturday, September 30, 2023 10:32 AM > *To:* Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> > *Cc:* Trilok Soni <tsoni(a)quicinc.com> > *Subject:* Hamoa CLO tree access > > Hey Srini, > > There seem to be a lot of requests from within QC for access to our CLO > tree, would you be able to provide me access to add folks so I don’t > have to trouble you guys for every request? > > Thanks, > > Rajendra >

1 0