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

[PATCH 0/2] ASoC: cs35l56: Don't patch firmware that is already patched
by Richard Fitzgerald 15 Aug '23

15 Aug '23

Use the FIRMWARE_MISSING flag in the CS35L56 to determine whether it is safe to download a firmware patch. Richard Fitzgerald (2): ASoC: wm_adsp: Support powering-up DSP without trying to load firmware ASoC: cs35l56: Don't overwrite a patched firmware sound/soc/codecs/cs35l56.c | 19 ++++++++++++++++--- sound/soc/codecs/wm_adsp.c | 16 +++++++++------- sound/soc/codecs/wm_adsp.h | 2 +- 3 files changed, 26 insertions(+), 11 deletions(-) -- 2.30.2

2 3

[PATCH 0/2] ASoC: SOF: topology: simplify kcontrol names with token
by Pierre-Louis Bossart 15 Aug '23

15 Aug '23

The use of the widget name as a prefix for the kcontrol name is quite useful in the case of multiple pipelines going to the same endpoint, but it's overkill in simpler cases. This patchset extends the existing DAPM code to drop the widget name prefix and make the kcontrol names simpler when there's no possible ambiguity, e.g. "gain.2.1 Main Playback Volume" becomes just "Main Playback Volume". Jyri Sarha (2): ASoC: dapm: Add a flag for not having widget name in kcontrol name ASoC: SOF: topology: Add a token for dropping widget name in kcontrol name include/sound/soc-dapm.h | 1 + include/uapi/sound/sof/tokens.h | 6 +++++- sound/soc/soc-dapm.c | 2 ++ sound/soc/sof/topology.c | 22 ++++++++++++++++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) -- 2.39.2

2 3

[PATCH] ASoC: SOF: Intel: Refactor code for HDA stream creation
by Pierre-Louis Bossart 15 Aug '23

15 Aug '23

From: Chao Song <chao.song(a)linux.intel.com> Existing HDA stream creation is split into two for loops for capture and playback, but most of the code in the two for loops are duplicated. This patch refactors HDA stream creation with a single for loop, thus remove code duplication. No functional change in this patch. Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Rander Wang <rander.wang(a)intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Signed-off-by: Chao Song <chao.song(a)linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/sof/intel/hda-stream.c | 68 ++++---------------------------- 1 file changed, 8 insertions(+), 60 deletions(-) diff --git a/sound/soc/sof/intel/hda-stream.c b/sound/soc/sof/intel/hda-stream.c index b13acb959653..0b0087abcc50 100644 --- a/sound/soc/sof/intel/hda-stream.c +++ b/sound/soc/sof/intel/hda-stream.c @@ -869,8 +869,8 @@ int hda_dsp_stream_init(struct snd_sof_dev *sdev) return -ENOMEM; } - /* create capture streams */ - for (i = 0; i < num_capture; i++) { + /* create capture and playback streams */ + for (i = 0; i < num_total; i++) { struct sof_intel_hda_stream *hda_stream; hda_stream = devm_kzalloc(sdev->dev, sizeof(*hda_stream), @@ -909,69 +909,17 @@ int hda_dsp_stream_init(struct snd_sof_dev *sdev) hstream->index = i; sd_offset = SOF_STREAM_SD_OFFSET(hstream); hstream->sd_addr = sdev->bar[HDA_DSP_HDA_BAR] + sd_offset; - hstream->stream_tag = i + 1; hstream->opened = false; hstream->running = false; - hstream->direction = SNDRV_PCM_STREAM_CAPTURE; - /* memory alloc for stream BDL */ - ret = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, &pci->dev, - HDA_DSP_BDL_SIZE, &hstream->bdl); - if (ret < 0) { - dev_err(sdev->dev, "error: stream bdl dma alloc failed\n"); - return -ENOMEM; - } - hstream->posbuf = (__le32 *)(bus->posbuf.area + - (hstream->index) * 8); - - list_add_tail(&hstream->list, &bus->stream_list); - } - - /* create playback streams */ - for (i = num_capture; i < num_total; i++) { - struct sof_intel_hda_stream *hda_stream; - - hda_stream = devm_kzalloc(sdev->dev, sizeof(*hda_stream), - GFP_KERNEL); - if (!hda_stream) - return -ENOMEM; - - hda_stream->sdev = sdev; - - hext_stream = &hda_stream->hext_stream; - - if (sdev->bar[HDA_DSP_PP_BAR]) { - hext_stream->pphc_addr = sdev->bar[HDA_DSP_PP_BAR] + - SOF_HDA_PPHC_BASE + SOF_HDA_PPHC_INTERVAL * i; - - hext_stream->pplc_addr = sdev->bar[HDA_DSP_PP_BAR] + - SOF_HDA_PPLC_BASE + SOF_HDA_PPLC_MULTI * num_total + - SOF_HDA_PPLC_INTERVAL * i; + if (i < num_capture) { + hstream->stream_tag = i + 1; + hstream->direction = SNDRV_PCM_STREAM_CAPTURE; + } else { + hstream->stream_tag = i - num_capture + 1; + hstream->direction = SNDRV_PCM_STREAM_PLAYBACK; } - hstream = &hext_stream->hstream; - - /* do we support SPIB */ - if (sdev->bar[HDA_DSP_SPIB_BAR]) { - hstream->spib_addr = sdev->bar[HDA_DSP_SPIB_BAR] + - SOF_HDA_SPIB_BASE + SOF_HDA_SPIB_INTERVAL * i + - SOF_HDA_SPIB_SPIB; - - hstream->fifo_addr = sdev->bar[HDA_DSP_SPIB_BAR] + - SOF_HDA_SPIB_BASE + SOF_HDA_SPIB_INTERVAL * i + - SOF_HDA_SPIB_MAXFIFO; - } - - hstream->bus = bus; - hstream->sd_int_sta_mask = 1 << i; - hstream->index = i; - sd_offset = SOF_STREAM_SD_OFFSET(hstream); - hstream->sd_addr = sdev->bar[HDA_DSP_HDA_BAR] + sd_offset; - hstream->stream_tag = i - num_capture + 1; - hstream->opened = false; - hstream->running = false; - hstream->direction = SNDRV_PCM_STREAM_PLAYBACK; - /* mem alloc for stream BDL */ ret = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, &pci->dev, HDA_DSP_BDL_SIZE, &hstream->bdl); -- 2.39.2

2 1

[PATCH 0/4] ASoC: Intel: RPL/MTL machine updates for 6.6
by Pierre-Louis Bossart 15 Aug '23

15 Aug '23

4 commits with the match tables for RaptorLake and MeteorLake devices. Balamurugan C (3): ASoC: Intel: soc-acpi: Add entry for sof_es8336 in RPL match table. ASoC: Intel: soc-acpi: Add entry for HDMI_In capture support in RPL match table ASoC: Intel: RPL: Add entry for HDMI-In capture support on non-I2S codec boards. Chao Song (1): ASoC: Intel: soc-acpi: add support for Dell SKU0C87 devices sound/soc/intel/boards/sof_es8336.c | 10 ++++ sound/soc/intel/boards/sof_ssp_amp.c | 9 ++++ .../intel/common/soc-acpi-intel-mtl-match.c | 52 +++++++++++++++++++ .../intel/common/soc-acpi-intel-rpl-match.c | 30 +++++++++++ 4 files changed, 101 insertions(+) -- 2.39.2

2 5

[PATCH] ASoC: SOF: remove duplicate code due to merge
by Pierre-Louis Bossart 15 Aug '23

15 Aug '23

Commit 81113108491e ("ASoC: Merge up fixes") added the same code twice, remove the extra call. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/sof/ipc4-topology.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sound/soc/sof/ipc4-topology.c b/sound/soc/sof/ipc4-topology.c index b43663822613..633f6040d712 100644 --- a/sound/soc/sof/ipc4-topology.c +++ b/sound/soc/sof/ipc4-topology.c @@ -1734,9 +1734,6 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget, /* update pipeline memory usage */ sof_ipc4_update_resource_usage(sdev, swidget, &copier_data->base_config); - /* update pipeline memory usage */ - sof_ipc4_update_resource_usage(sdev, swidget, &copier_data->base_config); - /* copy IPC data */ memcpy(*ipc_config_data, (void *)copier_data, sizeof(*copier_data)); if (gtw_cfg_config_length) -- 2.39.2

3 2

[PATCH -next 0/2] Use devm_kmemdup to replace devm_kmalloc + memcpy
by Li Zetao 15 Aug '23

15 Aug '23

This patch set use the helper function devm_kmemdup() to replace devm_kmalloc + memcpy, which is the same as implementing the function separately. Li Zetao (2): ASoC: tas5805m: Use devm_kmemdup to replace devm_kmalloc + memcpy ASoC: SOF: ipc3: Use devm_kmemdup to replace devm_kmalloc + memcpy sound/soc/codecs/tas5805m.c | 3 +-- sound/soc/sof/ipc3.c | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) -- 2.34.1

4 5

[GIT PULL] ASoC fixes for v6.5-rc6
by Mark Brown 15 Aug '23

15 Aug '23

The following changes since commit 5d0c230f1de8c7515b6567d9afba1f196fb4e2f4: Linux 6.5-rc4 (2023-07-30 13:23:47 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v6.5-rc6 for you to fetch changes up to 37aba3190891d4de189bd5192ee95220e295f34d: ASoC: rt1308-sdw: fix random louder sound (2023-08-13 18:16:32 +0100) ---------------------------------------------------------------- ASoC: Fixes for v6.5 A fairly large collection of fixes here, mostly SOF and Intel related. The one core fix is Hans' change which reduces the log spam when working out new use cases for DPCM. ---------------------------------------------------------------- Bard Liao (1): ASoC: max98363: don't return on success reading revision ID Daniel Baluta (1): ASoC: fsl: micfil: Use dual license micfil code Hans de Goede (1): ASoC: lower "no backend DAIs enabled for ... Port" log severity Jerome Brunet (1): ASoC: meson: axg-tdm-formatter: fix channel slot allocation Peter Ujfalusi (1): ASoC: SOF: ipc4-topology: Update the basecfg for copier earlier Pierre-Louis Bossart (1): ASoC: Intel: sof-sdw: update jack detection quirk for LunarLake RVP Ranjani Sridharan (1): ASoC: SOF: intel: hda: Clean up link DMA for IPC3 during stop Shuming Fan (1): ASoC: rt1308-sdw: fix random louder sound Xia Fukun (1): ASoC: SOF: Fix incorrect use of sizeof in sof_ipc3_do_rx_work() Zhang Shurong (1): ASoC: rt5665: add missed regulator_bulk_disable jairaj-arava (1): ASoC: Intel: sof-sdw-cs42142: fix for codec button mapping sound/soc/codecs/max98363.c | 9 ++++--- sound/soc/codecs/rt1308-sdw.c | 13 +++++++++- sound/soc/codecs/rt5665.c | 2 ++ sound/soc/fsl/fsl_micfil.c | 4 +-- sound/soc/fsl/fsl_micfil.h | 2 +- sound/soc/intel/boards/sof_sdw.c | 2 +- sound/soc/intel/boards/sof_sdw_cs42l42.c | 6 ++--- sound/soc/meson/axg-tdm-formatter.c | 42 ++++++++++++++++++++------------ sound/soc/soc-pcm.c | 8 ++++-- sound/soc/sof/intel/hda-dai-ops.c | 11 ++++++++- sound/soc/sof/intel/hda-dai.c | 5 ++-- sound/soc/sof/intel/hda.h | 2 ++ sound/soc/sof/ipc3.c | 2 +- sound/soc/sof/ipc4-topology.c | 6 ++--- 14 files changed, 76 insertions(+), 38 deletions(-)

2 1

[PATCH] ASoC: soc-jack: calling snd_soc_jack_report causes a null pointer access
by mnlife 15 Aug '23

15 Aug '23

When snd_soc_card_jack_new is not called or the call fails, calling this function causes a null pointer access Signed-off-by: mnlife <mnlife(a)126.com> --- sound/soc/soc-jack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c index f951acb2ce362..b2cc13b9c77b7 100644 --- a/sound/soc/soc-jack.c +++ b/sound/soc/soc-jack.c @@ -37,7 +37,7 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask) struct snd_soc_jack_pin *pin; unsigned int sync = 0; - if (!jack) + if (!jack || !jack->jack) return; trace_snd_soc_jack_report(jack, mask, status); -- 2.25.1

2 1

[PATCH v1] ASoC: Intel: Add rpl_nau8318_8825 driver
by Ajye Huang 15 Aug '23

15 Aug '23

Boards were using this in older kernels before adl and rpl ids were split. Add this back to maintain support. Signed-off-by: Ajye Huang <ajye_huang(a)compal.corp-partner.google.com> --- sound/soc/intel/boards/sof_nau8825.c | 10 ++++++++++ sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 12 ++++++++++++ 2 files changed, 22 insertions(+) diff --git a/sound/soc/intel/boards/sof_nau8825.c b/sound/soc/intel/boards/sof_nau8825.c index 4fc6e1c6aef3..46b7ecf6f9f1 100644 --- a/sound/soc/intel/boards/sof_nau8825.c +++ b/sound/soc/intel/boards/sof_nau8825.c @@ -684,6 +684,16 @@ static const struct platform_device_id board_ids[] = { SOF_BT_OFFLOAD_SSP(2) | SOF_SSP_BT_OFFLOAD_PRESENT), }, + { + .name = "rpl_nau8318_8825", + .driver_data = (kernel_ulong_t)(SOF_NAU8825_SSP_CODEC(0) | + SOF_SPEAKER_AMP_PRESENT | + SOF_NAU8318_SPEAKER_AMP_PRESENT | + SOF_NAU8825_SSP_AMP(1) | + SOF_NAU8825_NUM_HDMIDEV(4) | + SOF_BT_OFFLOAD_SSP(2) | + SOF_SSP_BT_OFFLOAD_PRESENT), + }, { } }; MODULE_DEVICE_TABLE(platform, board_ids); diff --git a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c index 4eefdb2dd45c..1dd699181765 100644 --- a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c @@ -351,6 +351,11 @@ static const struct snd_soc_acpi_codecs rpl_rt1019p_amp = { .codecs = {"RTL1019"} }; +static const struct snd_soc_acpi_codecs rpl_nau8318_amp = { + .num_codecs = 1, + .codecs = {"NVTN2012"} +}; + struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = { { .comp_ids = &rpl_rt5682_hp, @@ -373,6 +378,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = { .quirk_data = &rpl_max98373_amp, .sof_tplg_filename = "sof-rpl-max98373-nau8825.tplg", }, + { + .id = "10508825", + .drv_name = "rpl_nau8318_8825", + .machine_quirk = snd_soc_acpi_codec_list, + .quirk_data = &rpl_nau8318_amp, + .sof_tplg_filename = "sof-rpl-nau8318-nau8825.tplg", + }, { .comp_ids = &rpl_rt5682_hp, .drv_name = "rpl_rt1019_rt5682", -- 2.25.1

3 3

[PATCH 00/25] ALSA: Generic PCM copy ops using iov_iter
by Takashi Iwai 15 Aug '23

15 Aug '23

Hi, this is a revised patch set for cleaning up the PCM copy ops using iov_iter to deal with kernel / user-space pointers consistently. The previous patch set was based on sockptr_t: https://lore.kernel.org/r/20230731154718.31048-1-tiwai@suse.de But this approach was NAK'ed as iov_iter is a preferred way for achieving the purpose: https://lore.kernel.org/r/87edkce118.wl-tiwai@suse.de The patch set starts with the missing export of import_ubuf() function, followed by the new copy_ops using iov_iter, extensions of some helpers and replacements of the existing code. It resulted in a good amount of code reduction. Takashi === Cc: Alexander Viro <viro(a)zeniv.linux.org.uk> Cc: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> Cc: Andrey Utkin <andrey_utkin(a)fastmail.com> Cc: Anton Sviridenko <anton(a)corp.bluecherry.net> Cc: Arnaud Pouliquen <arnaud.pouliquen(a)foss.st.com> Cc: Banajit Goswami <bgoswami(a)quicinc.com> Cc: Bluecherry Maintainers <maintainers(a)bluecherrydvr.com> Cc: Claudiu Beznea <claudiu.beznea(a)microchip.com> Cc: Ismael Luceno <ismael(a)iodev.co.uk> Cc: Lars-Peter Clausen <lars(a)metafoo.de> Cc: Mark Brown <broonie(a)kernel.org> Cc: Mauro Carvalho Chehab <mchehab(a)kernel.org> Cc: Oleksandr Andrushchenko <oleksandr_andrushchenko(a)epam.com> Cc: Olivier Moysan <olivier.moysan(a)foss.st.com> Cc: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Cc: linux-media(a)vger.kernel.org Cc: xen-devel(a)lists.xenproject.org === Takashi Iwai (25): iov_iter: Export import_ubuf() ALSA: pcm: Add copy ops with iov_iter ALSA: core: Add memory copy helpers between iov_iter and iomem ALSA: dummy: Convert to generic PCM copy ops ALSA: gus: Convert to generic PCM copy ops ALSA: emu8000: Convert to generic PCM copy ops ALSA: es1938: Convert to generic PCM copy ops ALSA: korg1212: Convert to generic PCM copy ops ALSA: nm256: Convert to generic PCM copy ops ALSA: rme32: Convert to generic PCM copy ops ALSA: rme96: Convert to generic PCM copy ops ALSA: hdsp: Convert to generic PCM copy ops ALSA: rme9652: Convert to generic PCM copy ops ALSA: sh: Convert to generic PCM copy ops ALSA: xen: Convert to generic PCM copy ops ALSA: pcmtest: Update comment about PCM copy ops media: solo6x10: Convert to generic PCM copy ops ASoC: component: Add generic PCM copy ops ASoC: mediatek: Convert to generic PCM copy ops ASoC: qcom: Convert to generic PCM copy ops ASoC: dmaengine: Convert to generic PCM copy ops ASoC: dmaengine: Use iov_iter for process callback, too ALSA: doc: Update description for the new PCM copy ops ASoC: pcm: Drop obsoleted PCM copy_user ops ALSA: pcm: Drop obsoleted PCM copy_user and copy_kernel ops .../kernel-api/writing-an-alsa-driver.rst | 58 ++++------- drivers/media/pci/solo6x10/solo6x10-g723.c | 38 +------- include/sound/dmaengine_pcm.h | 2 +- include/sound/pcm.h | 13 ++- include/sound/soc-component.h | 14 +-- lib/iov_iter.c | 1 + sound/core/memory.c | 56 +++++++++-- sound/core/pcm_lib.c | 95 ++++++++++--------- sound/core/pcm_native.c | 2 +- sound/drivers/dummy.c | 12 +-- sound/drivers/pcmtest.c | 2 +- sound/isa/gus/gus_pcm.c | 23 +---- sound/isa/sb/emu8000_pcm.c | 74 ++++----------- sound/pci/es1938.c | 30 +----- sound/pci/korg1212/korg1212.c | 50 +++------- sound/pci/nm256/nm256.c | 42 ++------ sound/pci/rme32.c | 50 +++------- sound/pci/rme96.c | 42 ++------ sound/pci/rme9652/hdsp.c | 42 ++------ sound/pci/rme9652/rme9652.c | 46 ++------- sound/sh/sh_dac_audio.c | 25 +---- sound/soc/atmel/mchp-pdmc.c | 2 +- sound/soc/mediatek/common/mtk-btcvsd.c | 23 ++--- sound/soc/qcom/lpass-platform.c | 13 +-- sound/soc/soc-component.c | 10 +- sound/soc/soc-generic-dmaengine-pcm.c | 18 ++-- sound/soc/soc-pcm.c | 4 +- sound/soc/stm/stm32_sai_sub.c | 2 +- sound/xen/xen_snd_front_alsa.c | 55 ++--------- 29 files changed, 263 insertions(+), 581 deletions(-) -- 2.35.3

5 43