- Sound-open-firmware - mailman.alsa-project.org

Re: [PATCH] ASoC: SOF: amd: Add support for IPC with a reply_size set to zero
by Mark Brown 14 Jun '23

14 Jun '23

On Wed, 14 Jun 2023 16:07:05 +0530, Venkata Prasad Potturu wrote: > Add support for IPC tx_message with a reply_size set to zero, > return zero when message reply_size is zero at acp_dsp_ipc_get_reply(). > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: SOF: amd: Add support for IPC with a reply_size set to zero commit: fd01a15164a15328fd96f9ce820f0fc9f700f00b All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark

1 0

Re: [PATCH] ASoC: SOF: ipc4-topology: Improve unlocking of a mutex in sof_ipc4_widget_free()
by Pierre-Louis Bossart 12 Jun '23

12 Jun '23

On 6/10/23 06:36, Markus Elfring wrote: > From: Markus Elfring <elfring(a)users.sourceforge.net> > Date: Sat, 10 Jun 2023 12:40:09 +0200 > > Add a jump target so that a call of the function “mutex_unlock” > is stored only once in this function implementation. > > Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> > --- > sound/soc/sof/ipc4-topology.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/sound/soc/sof/ipc4-topology.c b/sound/soc/sof/ipc4-topology.c > index a4e1a70b607d..f0fd1dfa384e 100644 > --- a/sound/soc/sof/ipc4-topology.c > +++ b/sound/soc/sof/ipc4-topology.c > @@ -2300,8 +2300,7 @@ static int sof_ipc4_widget_free(struct snd_sof_dev *sdev, struct snd_sof_widget > if (pipeline->use_chain_dma) { > dev_warn(sdev->dev, "use_chain_dma set for scheduler %s", > swidget->widget->name); > - mutex_unlock(&ipc4_data->pipeline_state_mutex); > - return 0; > + goto unlock; > } > > header = SOF_IPC4_GLB_PIPE_INSTANCE_ID(swidget->instance_id); > @@ -2326,7 +2325,7 @@ static int sof_ipc4_widget_free(struct snd_sof_dev *sdev, struct snd_sof_widget > if (!pipeline->use_chain_dma) > ida_free(&fw_module->m_ida, swidget->instance_id); > } > - > +unlock: > mutex_unlock(&ipc4_data->pipeline_state_mutex); > > return ret; The change looks good but I am wondering if we need to print a dev_warn log which is already done on the sof_ipc4_widget_setup() path. This seems redundant. Ranjani, can we simplify?

1 0

[PATCH] ASoC: SOF: ipc4-topology: Use size_t for variable passed to kzalloc()
by Christophe JAILLET 02 Jun '23

02 Jun '23

struct_size() checks for overflow, but assigning its result to just a u32 may still overflow after a successful check. Use a size_t instead in order to be cleaner. Signed-off-by: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> --- Based on analysis from Dan Carpenter on another patch (see [1]). [1]: https://lore.kernel.org/all/00e84595-e2c9-48ea-8737-18da34eaafbf@kili.mount… --- 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 db64e0cb8663..50faa4c88b97 100644 --- a/sound/soc/sof/ipc4-topology.c +++ b/sound/soc/sof/ipc4-topology.c @@ -881,7 +881,7 @@ static int sof_ipc4_widget_setup_comp_process(struct snd_sof_widget *swidget) /* allocate memory for base config extension if needed */ 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, + size_t ext_size = struct_size(base_cfg_ext, pin_formats, swidget->num_input_pins + swidget->num_output_pins); base_cfg_ext = kzalloc(ext_size, GFP_KERNEL); -- 2.34.1

3 3

[PATCH v3 0/1] ASoC: SOF: add mt8188 audio support
by Trevor Wu 01 Jun '23

01 Jun '23

This series adds mt8188 audio support and dbg_dump callback for mt8186 and mt8188. Changes since v2: - resend the correct patch for adsp debug dump Changes since v1: - fix typo - adopt reviewer's suggestion Trevor Wu (1): ASoC: SOF: mediatek: add adsp debug dump sound/soc/sof/mediatek/mt8186/mt8186.c | 22 ++++++++++++++++++++++ sound/soc/sof/mediatek/mt8186/mt8186.h | 5 +++++ 2 files changed, 27 insertions(+) -- 2.18.0

3 3

Re: [PATCH v2 2/2] ASoC: SOF: mediatek: add adsp debug dump
by Trevor Wu (吳文良) 01 Jun '23

01 Jun '23

On Tue, 2023-05-30 at 15:12 +0100, Mark Brown wrote: > On Tue, May 23, 2023 at 10:59:33AM +0800, Trevor Wu wrote: > > Add mt8188 and mt8186 .dbg_dump callback to print some information > > when > > DSP panic occurs. > > This breaks an x86_64 allmodconfig build: > > /build/stage/linux/sound/soc/sof/mediatek/mt8186/mt8186.c: In > function ‘mt8186_adsp_dump’: > /build/stage/linux/sound/soc/sof/mediatek/mt8186/mt8186.c:483:56: > error: ‘DSP_PDEBUGDATA’ undeclared (first use in this function); did > you mean ‘DSP_PDEBUGPC’? > 483 | dbg_data = snd_sof_dsp_read(sdev, DSP_REG_BAR, > DSP_PDEBUGDATA); > | ^~~~~~ > ~~~~~~~~ > | DSP_PD > EBUGPC > /build/stage/linux/sound/soc/sof/mediatek/mt8186/mt8186.c:483:56: > note: each undeclared identifier is reported only once for each > function it appears in > /build/stage/linux/sound/soc/sof/mediatek/mt8186/mt8186.c:484:56: > error: ‘DSP_PDEBUGINST’ undeclared (first use in this function); did > you mean ‘DSP_PDEBUGPC’? > 484 | dbg_inst = snd_sof_dsp_read(sdev, DSP_REG_BAR, > DSP_PDEBUGINST); > | ^~~~~~ > ~~~~~~~~ > | DSP_PD > EBUGPC > /build/stage/linux/sound/soc/sof/mediatek/mt8186/mt8186.c:485:59: > error: ‘DSP_PDEBUGLS0STAT’ undeclared (first use in this function) > 485 | dbg_ls0stat = snd_sof_dsp_read(sdev, DSP_REG_BAR, > DSP_PDEBUGLS0STAT); > | ^~~ > ~~~~~~~~~~~~~~ > /build/stage/linux/sound/soc/sof/mediatek/mt8186/mt8186.c:486:58: > error: ‘DSP_PDEBUGSTATUS’ undeclared (first use in this function); > did you mean ‘DSP_PDEBUGPC’? > 486 | dbg_status = snd_sof_dsp_read(sdev, DSP_REG_BAR, > DSP_PDEBUGSTATUS); > | ^~~~ > ~~~~~~~~~~~~ > | DSP_ > PDEBUGPC > /build/stage/linux/sound/soc/sof/mediatek/mt8186/mt8186.c:487:57: > error: ‘DSP_PFAULTINFO’ undeclared (first use in this function) > 487 | faultinfo = snd_sof_dsp_read(sdev, DSP_REG_BAR, > DSP_PFAULTINFO); > | ^~~~~ > ~~~~~~~~~ Sorry, I didn't notice that I missed the header which possibly caused by the wrong format-patch command. I checked the same patch in v1, and the header was included in the series. I will send v3 to resolve the problem. Thanks, Trevor

1 0

Re: [PATCH 1/2] ASoC: SOF: mediatek: add mt8188 audio support
by Pierre-Louis Bossart 01 Jun '23

01 Jun '23

On 5/15/23 10:05, Mark Brown wrote: > On Mon, May 15, 2023 at 01:25:44PM +0200, AngeloGioacchino Del Regno wrote: >> Il 15/05/23 07:25, Trevor Wu ha scritto: > >>> +{ >>> + /* common defaults */ >>> + memcpy(&sof_mt8188_ops, &sof_mt8186_ops, sizeof(struct snd_sof_dsp_ops)); > >> Never use sizeof(type), always use destination var size! Anyway, there's more. >> >> I don't think we need to perform this memcpy: we'll never see an instance of >> both mt8186 and mt8188 drivers on the same machine, so you can safely just use >> sof_mt8186_ops for mt8188... > >>> + sof_mt8188_ops.drv = mt8188_dai; > >> ...which obviously means that this becomes > >> sof_mt8186_ops.drv = mt8188_dai; > > This does have the issue that it then means the ops struct isn't const > which isn't ideal. It's also not the end of the world though so I don't > have super strong feelings. We do the same for Intel devices, we have a common structure which is copied and only the members that differ in specific SOCs are updated. You're right that it's not constant, but it avoids copy-paste of a rather large structure just to change a couple of lines.

2 2

[PATCH v2 0/2] ASoC: SOF: add mt8188 audio support
by Trevor Wu 30 May '23

30 May '23

This series adds mt8188 audio support and dbg_dump callback for mt8186 and mt8188. Changes since v1: - fix typo - adopt reviewer's suggestion Trevor Wu (2): ASoC: SOF: mediatek: add mt8188 audio support ASoC: SOF: mediatek: add adsp debug dump sound/soc/sof/mediatek/mt8186/mt8186.c | 83 +++++++++++++++++++++++++- 1 file changed, 82 insertions(+), 1 deletion(-) -- 2.18.0

2 3

[PATCH] sound: Fix incorrect calculation of object size by sizeof
by Lu Hongfei 30 May '23

30 May '23

What we need to calculate is the size of the object, not the size of the pointer. This patch can fix this error. Signed-off-by: Lu Hongfei <luhongfei(a)vivo.com> --- sound/soc/sof/ipc4-topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 sound/soc/sof/ipc4-topology.c diff --git a/sound/soc/sof/ipc4-topology.c b/sound/soc/sof/ipc4-topology.c index 5abe616a2054..29b6dede53b0 --- a/sound/soc/sof/ipc4-topology.c +++ b/sound/soc/sof/ipc4-topology.c @@ -220,7 +220,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.39.0

1 0

[PATCH AUTOSEL 6.1 29/57] ASoC: SOF: pm: save io region state in case of errors in resume
by Sasha Levin 25 May '23

25 May '23

From: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> [ Upstream commit 171b53be635ac15d4feafeb33946035649b1ca14 ] If there are failures in DSP runtime resume, the device state will not reach active and this makes it impossible e.g. to retrieve a possible DSP panic dump via "exception" debugfs node. If CONFIG_SND_SOC_SOF_DEBUG_ENABLE_DEBUGFS_CACHE=y is set, the data in cache is stale. If debugfs cache is not used, the region simply cannot be read. To allow debugging these scenarios, update the debugfs cache contents in resume error handler. User-space can then later retrieve DSP panic and other state via debugfs (requires SOF debugfs cache to be enabled in build). Reported-by: Curtis Malainey <cujomalainey(a)chromium.org Link: https://github.com/thesofproject/linux/issues/4274 Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com Reviewed-by: Curtis Malainey <cujomalainey(a)chromium.org Reviewed-by: Péter Ujfalusi <peter.ujfalusi(a)linux.intel.com Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com Link: https://lore.kernel.org/r/20230512104638.21376-1-peter.ujfalusi@linux.intel… Signed-off-by: Mark Brown <broonie(a)kernel.org Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/sof/pm.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/sound/soc/sof/pm.c b/sound/soc/sof/pm.c index 26ffcbb6e30f4..a1bfa5a37e2ad 100644 --- a/sound/soc/sof/pm.c +++ b/sound/soc/sof/pm.c @@ -159,7 +159,7 @@ static int sof_resume(struct device *dev, bool runtime_resume) ret = tplg_ops->set_up_all_pipelines(sdev, false); if (ret < 0) { dev_err(sdev->dev, "Failed to restore pipeline after resume %d\n", ret); - return ret; + goto setup_fail; } } @@ -173,6 +173,18 @@ static int sof_resume(struct device *dev, bool runtime_resume) dev_err(sdev->dev, "ctx_restore IPC error during resume: %d\n", ret); } +setup_fail: +#if IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_ENABLE_DEBUGFS_CACHE) + if (ret < 0) { + /* + * Debugfs cannot be read in runtime suspend, so cache + * the contents upon failure. This allows to capture + * possible DSP coredump information. + */ + sof_cache_debugfs(sdev); + } +#endif + return ret; } -- 2.39.2

1 0

[PATCH AUTOSEL 6.1 28/57] ASoC: SOF: sof-client-probes: fix pm_runtime imbalance in error handling
by Sasha Levin 25 May '23

25 May '23

From: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> [ Upstream commit bc424273c74c1565c459c8f2a6ed95caee368d0a ] When an error occurs, we need to make sure the device can pm_runtime suspend instead of keeping it active. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com Reviewed-by: Daniel Baluta <daniel.baluta(a)nxp.com Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com Link: https://lore.kernel.org/r/20230512103315.8921-4-peter.ujfalusi@linux.intel.… Signed-off-by: Mark Brown <broonie(a)kernel.org Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/sof/sof-client-probes.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/sof/sof-client-probes.c b/sound/soc/sof/sof-client-probes.c index ddeabbb5580e1..1e521a9e34d27 100644 --- a/sound/soc/sof/sof-client-probes.c +++ b/sound/soc/sof/sof-client-probes.c @@ -441,12 +441,7 @@ static ssize_t sof_probes_dfs_points_read(struct file *file, char __user *to, ret = sof_probes_points_info(cdev, &desc, &num_desc); if (ret < 0) - goto exit; - - pm_runtime_mark_last_busy(dev); - err = pm_runtime_put_autosuspend(dev); - if (err < 0) - dev_err_ratelimited(dev, "debugfs read failed to idle %d\n", err); + goto pm_error; for (i = 0; i < num_desc; i++) { offset = strlen(buf); @@ -464,6 +459,13 @@ static ssize_t sof_probes_dfs_points_read(struct file *file, char __user *to, ret = simple_read_from_buffer(to, count, ppos, buf, strlen(buf)); kfree(desc); + +pm_error: + pm_runtime_mark_last_busy(dev); + err = pm_runtime_put_autosuspend(dev); + if (err < 0) + dev_err_ratelimited(dev, "debugfs read failed to idle %d\n", err); + exit: kfree(buf); return ret; -- 2.39.2

1 0