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

[PATCH v2] ASoC: SOF: ipc4-topology: fix wrong sizeof argument
by Peter Ujfalusi 15 Sep '23

15 Sep '23

From: Bard Liao <yung-chuan.liao(a)linux.intel.com> available_fmt is a pointer. Fixes: 4fdef47a44d6 ("ASoC: SOF: ipc4-topology: Add new tokens for input/output pin format count") Signed-off-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> --- sound/soc/sof/ipc4-topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/ipc4-topology.c b/sound/soc/sof/ipc4-topology.c index f2a30cd31378..7cb63e6b24dc 100644 --- a/sound/soc/sof/ipc4-topology.c +++ b/sound/soc/sof/ipc4-topology.c @@ -231,7 +231,7 @@ static int sof_ipc4_get_audio_fmt(struct snd_soc_component *scomp, ret = sof_update_ipc_object(scomp, available_fmt, SOF_AUDIO_FMT_NUM_TOKENS, swidget->tuples, - swidget->num_tuples, sizeof(available_fmt), 1); + swidget->num_tuples, sizeof(*available_fmt), 1); if (ret) { dev_err(scomp->dev, "Failed to parse audio format token count\n"); return ret; -- 2.42.0

2 1

[PATCH] ASoC: SOF: ipc4-topology: Add deep buffer size to debug prints
by Peter Ujfalusi 15 Sep '23

15 Sep '23

From: Yong Zhi <yong.zhi(a)intel.com> Print deep_buffer_dma_ms and dma_buffer_size for debug purpose. Signed-off-by: Yong Zhi <yong.zhi(a)intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> --- sound/soc/sof/ipc4-topology.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sound/soc/sof/ipc4-topology.c b/sound/soc/sof/ipc4-topology.c index 7cb63e6b24dc..8aa07ccfa569 100644 --- a/sound/soc/sof/ipc4-topology.c +++ b/sound/soc/sof/ipc4-topology.c @@ -1726,9 +1726,14 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget, SOF_IPC4_MIN_DMA_BUFFER_SIZE * copier_data->base_config.ibs; break; case snd_soc_dapm_aif_in: - copier_data->gtw_cfg.dma_buffer_size = - max((u32)SOF_IPC4_MIN_DMA_BUFFER_SIZE, deep_buffer_dma_ms) * - copier_data->base_config.ibs; + copier_data->gtw_cfg.dma_buffer_size = + max((u32)SOF_IPC4_MIN_DMA_BUFFER_SIZE, deep_buffer_dma_ms) * + copier_data->base_config.ibs; + dev_dbg(sdev->dev, "copier %s, dma buffer%s: %u ms (%u bytes)", + swidget->widget->name, + deep_buffer_dma_ms ? " (using Deep Buffer)" : "", + max((u32)SOF_IPC4_MIN_DMA_BUFFER_SIZE, deep_buffer_dma_ms), + copier_data->gtw_cfg.dma_buffer_size); break; case snd_soc_dapm_dai_out: case snd_soc_dapm_aif_out: -- 2.42.0

2 1

[PATCH] ASoC: SOF: ipc4: Dump the payload also when set_get_data fails
by Peter Ujfalusi 15 Sep '23

15 Sep '23

Move the out label to dump the message payload when the IPC message fails. The payload contains important information on what might have caused the error in firmware. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/sof/ipc4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/ipc4.c b/sound/soc/sof/ipc4.c index ab6eddd91bb7..9744627d6978 100644 --- a/sound/soc/sof/ipc4.c +++ b/sound/soc/sof/ipc4.c @@ -513,10 +513,10 @@ static int sof_ipc4_set_get_data(struct snd_sof_dev *sdev, void *data, if (!set && payload_bytes != offset) ipc4_msg->data_size = offset; +out: if (sof_debug_check_flag(SOF_DBG_DUMP_IPC_MESSAGE_PAYLOAD)) sof_ipc4_dump_payload(sdev, ipc4_msg->data_ptr, ipc4_msg->data_size); -out: mutex_unlock(&sdev->ipc->tx_mutex); return ret; -- 2.42.0

2 1

[PATCH] ASoC: SOF: ops.h: Change the error code for not supported to EOPNOTSUPP
by Peter Ujfalusi 15 Sep '23

15 Sep '23

New code uses ENOTSUPP as per checkpatch recommendation: ENOTSUPP is not a SUSV4 error code, prefer EOPNOTSUPP Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Rander Wang <rander.wang(a)intel.com> --- sound/soc/sof/ops.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/sof/ops.h b/sound/soc/sof/ops.h index 9ab7b9be765b..a494bdef3739 100644 --- a/sound/soc/sof/ops.h +++ b/sound/soc/sof/ops.h @@ -202,7 +202,7 @@ static inline int snd_sof_dsp_get_mailbox_offset(struct snd_sof_dev *sdev) return sof_ops(sdev)->get_mailbox_offset(sdev); dev_err(sdev->dev, "error: %s not defined\n", __func__); - return -ENOTSUPP; + return -EOPNOTSUPP; } static inline int snd_sof_dsp_get_window_offset(struct snd_sof_dev *sdev, @@ -212,7 +212,7 @@ static inline int snd_sof_dsp_get_window_offset(struct snd_sof_dev *sdev, return sof_ops(sdev)->get_window_offset(sdev, id); dev_err(sdev->dev, "error: %s not defined\n", __func__); - return -ENOTSUPP; + return -EOPNOTSUPP; } /* power management */ static inline int snd_sof_dsp_resume(struct snd_sof_dev *sdev) -- 2.42.0

2 1

[PATCH] ASoC: SOF: sof-audio: Fix DSP core put imbalance on widget setup failure
by Peter Ujfalusi 15 Sep '23

15 Sep '23

In case the widget setup fails we should only decrement the core usage count if the sof_widget_free_unlocked() has not been called as part of the error handling. sof_widget_free_unlocked() calls snd_sof_dsp_core_put() and the additional core_put will cause imbalance in core usage count. Use the existing use_count_decremented to handle this issue. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/sof/sof-audio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c index e7ef77012c35..e5405f854a91 100644 --- a/sound/soc/sof/sof-audio.c +++ b/sound/soc/sof/sof-audio.c @@ -212,7 +212,8 @@ static int sof_widget_setup_unlocked(struct snd_sof_dev *sdev, sof_widget_free_unlocked(sdev, swidget); use_count_decremented = true; core_put: - snd_sof_dsp_core_put(sdev, swidget->core); + if (!use_count_decremented) + snd_sof_dsp_core_put(sdev, swidget->core); pipe_widget_free: if (swidget->id != snd_soc_dapm_scheduler) sof_widget_free_unlocked(sdev, swidget->spipe->pipe_widget); -- 2.42.0

2 1

[PATCH 0/3] ASoC: SOF: ipc4/Intel: Implement split fw library loading
by Peter Ujfalusi 15 Sep '23

15 Sep '23

Hi, This series implements support for split library loading to comply with the HDA DMA programming sequence recommendation, which is: 1. DSP side DMA programming and GEN bit set to 1 2. host side DMA programming and RUN bit set to 1 The SOF support for library loading is based on this sequence, backwards compatibility with older reference firmware is supported (where only the LOAD_LIBRARY message is supported). Regards, Peter --- Peter Ujfalusi (3): ASoC: SOF: Intel: hda: Add definition for SDxFIFOS.FIFOS mask ASoC: SOF: ipc4: Add new message type: SOF_IPC4_GLB_LOAD_LIBRARY_PREPARE ASoC: SOF: Intel: hda-loader: Add support for split library loading include/sound/sof/ipc4/header.h | 15 +++++++++--- sound/soc/sof/intel/hda-loader.c | 42 ++++++++++++++++++++++++++++++-- sound/soc/sof/intel/hda-stream.c | 2 +- sound/soc/sof/intel/hda.h | 3 +++ sound/soc/sof/ipc4.c | 1 + 5 files changed, 56 insertions(+), 7 deletions(-) -- 2.42.0

1 4

[PATCH v2 0/3] ASoC: wm8782: Allow higher audio rates
by John Watts 15 Sep '23

15 Sep '23

The wm8782 supports higher audio rates than just 48kHz. This is configured by setting the FSAMPEN pin on the codec chip. This patch series introduces the 'wlf,fsampen' device tree property to indicate the pin status and control the maximum rate available when using the codec. v1 -> v2: - Switched from max-rate property to wlf,fsampen property - Clarified property is optional, not required John Watts (3): ASoC: wm8782: Handle maximum audio rate at runtime ASoC: wm8782: Use wlf,fsampen device tree property ASoC: dt-bindings: wlf,wm8782: Add wlf,fsampen property .../devicetree/bindings/sound/wm8782.txt | 5 ++ sound/soc/codecs/wm8782.c | 66 +++++++++++++++---- 2 files changed, 58 insertions(+), 13 deletions(-) -- 2.42.0

4 10

[PATCH 00/13] ALSA: Fix -Wformat-truncation warnings
by Takashi Iwai 15 Sep '23

15 Sep '23

Hi, the recent change introduced -Wformat-truncation for the build with W=1, and this leads to many warnings. Most of them are false-positive, and they can be suppressed by replacing snprintf() with scnprintf() for explicit truncation. A couple of other code deserve for a slight improvement. Takashi === Takashi Iwai (13): ALSA: seq: ump: Fix -Wformat-truncation warning ALSA: seq: midi: Fix -Wformat-truncation warning ALSA: usb-audio: scarlett_gen2: Fix -Wformat-truncation warning ALSA: caiaq: Fix -Wformat-truncation warning ALSA: sscape: Fix -Wformat-truncation warning ALSA: cs4236: Fix -Wformat-truncation warning ALSA: es1688: Fix -Wformat-truncation warning ALSA: opti9x: Fix -Wformat-truncation warning ALSA: xen: Fix -Wformat-truncation warning ALSA: firewire: Fix -Wformat-truncation warning for longname string ALSA: firewire: Fix -Wformat-truncation warning for MIDI stream names ALSA: cmipci: Fix -Wformat-truncation warning ALSA: hda: generic: Check potential mixer name string truncation sound/core/seq/seq_midi.c | 4 ++-- sound/core/seq/seq_ump_client.c | 2 +- sound/firewire/bebob/bebob_midi.c | 6 +++--- sound/firewire/dice/dice-midi.c | 4 ++-- sound/firewire/digi00x/digi00x-midi.c | 14 +++++++------- sound/firewire/fireface/ff-midi.c | 4 ++-- sound/firewire/fireworks/fireworks.c | 10 +++++----- sound/firewire/fireworks/fireworks_midi.c | 4 ++-- sound/firewire/motu/motu-midi.c | 4 ++-- sound/firewire/oxfw/oxfw-midi.c | 6 +++--- sound/firewire/oxfw/oxfw.c | 10 +++++----- sound/firewire/tascam/tascam-midi.c | 12 ++++++------ sound/isa/cs423x/cs4236.c | 14 +++++++------- sound/isa/es1688/es1688.c | 6 +++--- sound/isa/opti9xx/miro.c | 8 ++++---- sound/isa/opti9xx/opti92x-ad1848.c | 16 ++++++++-------- sound/isa/sscape.c | 2 +- sound/pci/cmipci.c | 8 +++++--- sound/pci/hda/hda_generic.c | 6 +++++- sound/usb/caiaq/device.c | 2 +- sound/usb/mixer_scarlett_gen2.c | 4 ++-- sound/xen/xen_snd_front_cfg.c | 2 +- 22 files changed, 77 insertions(+), 71 deletions(-) -- 2.35.3

2 15

[PATCH 0/3] ALSA: Yer more fix -Wformat-truncation warnings
by Takashi Iwai 15 Sep '23

15 Sep '23

This is a few more similar patches covering the recent warnings by the -Wformat-truncation option. Takashi === Takashi Iwai (3): ALSA: ad1848: Fix -Wformat-truncation warning for longname string ALSA: cs4231: Fix -Wformat-truncation warning for longname string ALSA: riptide: Fix -Wformat-truncation warning for longname string sound/isa/ad1848/ad1848.c | 12 ++++++------ sound/isa/cs423x/cs4231.c | 12 ++++++------ sound/pci/riptide/riptide.c | 16 ++++++++-------- 3 files changed, 20 insertions(+), 20 deletions(-) -- 2.35.3

1 3

[PATCH v2] ALSA: hda: cs35l56: Fix missing RESET GPIO if _SUB is missing
by Richard Fitzgerald 15 Sep '23

15 Sep '23

In cs35l56_hda_read_acpi() do not return if ACPI _SUB is missing. A missing _SUB means that the driver cannot load a system-specific firmware, because the firmware is identified by the _SUB. But it can fallback to a generic firmware. Unfortunately this was being handled by immediately returning 0, which would skip the remaining ACPI configuration in cs35l56_hda_read_acpi() and so it would not get the RESET GPIO. Signed-off-by: Richard Fitzgerald <rf(a)opensource.cirrus.com> Fixes: 73cfbfa9caea ("ALSA: hda/cs35l56: Add driver for Cirrus Logic CS35L56 amplifier") --- sound/pci/hda/cs35l56_hda.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/sound/pci/hda/cs35l56_hda.c b/sound/pci/hda/cs35l56_hda.c index bc75865b5de8..87ffe8fbff99 100644 --- a/sound/pci/hda/cs35l56_hda.c +++ b/sound/pci/hda/cs35l56_hda.c @@ -865,15 +865,13 @@ static int cs35l56_hda_read_acpi(struct cs35l56_hda *cs35l56, int id) sub = acpi_get_subsystem_id(ACPI_HANDLE(cs35l56->base.dev)); if (IS_ERR(sub)) { - /* If no ACPI SUB, return 0 and fallback to legacy firmware path, otherwise fail */ - if (PTR_ERR(sub) == -ENODATA) - return 0; - else - return PTR_ERR(sub); + dev_info(cs35l56->base.dev, + "Read ACPI _SUB failed(%ld): fallback to generic firmware\n", + PTR_ERR(sub)); + } else { + cs35l56->system_name = sub; } - cs35l56->system_name = sub; - cs35l56->base.reset_gpio = devm_gpiod_get_index_optional(cs35l56->base.dev, "reset", cs35l56->index, -- 2.30.2

2 1