[PATCH 03/11] ASoC: Intel: avs: Have one location for dumping path-errors

From: Cezary Rojewski

Date: Fri Nov 13 2026 - 11:35:17 EST


Both path.c and pcm.c print the exact same error messages, one after the
other. Let the avs_path_xxx() handle the messaging so that its caller
need not to do themselves. At the same time enrich them with path's name
so there is no ambiguity which path is being manipulated.

Signed-off-by: Cezary Rojewski <cezary.rojewski@xxxxxxxxx>
---
sound/soc/intel/avs/path.c | 31 +++++++++++++-----------
sound/soc/intel/avs/pcm.c | 48 ++++++--------------------------------
2 files changed, 24 insertions(+), 55 deletions(-)

diff --git a/sound/soc/intel/avs/path.c b/sound/soc/intel/avs/path.c
index 936be206eece..e8bbc9058fc7 100644
--- a/sound/soc/intel/avs/path.c
+++ b/sound/soc/intel/avs/path.c
@@ -11,6 +11,7 @@
#include <acpi/nhlt.h>
#include <sound/pcm_params.h>
#include <sound/soc.h>
+#include <sound/soc-dapm.h>
#include "avs.h"
#include "control.h"
#include "path.h"
@@ -1187,18 +1188,11 @@ static struct avs_path *avs_path_create_unlocked(struct avs_dev *adev, u32 dma_i

static void avs_condpath_free(struct avs_dev *adev, struct avs_path *path)
{
- int ret;
-
list_del(&path->source_node);
list_del(&path->sink_node);

- ret = avs_path_reset(path);
- if (ret < 0)
- dev_err(adev->dev, "reset condpath failed: %d\n", ret);
-
- ret = avs_path_unbind(path);
- if (ret < 0)
- dev_err(adev->dev, "unbind condpath failed: %d\n", ret);
+ avs_path_reset(path);
+ avs_path_unbind(path);

avs_path_free_unlocked(path);
}
@@ -1373,6 +1367,13 @@ static int avs_path_bind_prepare(struct avs_dev *adev,
return 0;
}

+static const char *avs_path_name(struct avs_path *path)
+{
+ struct snd_soc_dapm_widget *w = path->template->owner->w;
+
+ return w ? w->name : "(condpath)";
+}
+
int avs_path_bind(struct avs_path *path)
{
struct avs_path_pipeline *ppl;
@@ -1397,7 +1398,8 @@ int avs_path_bind(struct avs_path *path)
sink->instance_id, binding->sink_pin,
binding->source_pin);
if (ret) {
- dev_err(adev->dev, "bind path failed: %d\n", ret);
+ dev_err(adev->dev, "bind path %s failed: %d\n",
+ avs_path_name(path), ret);
return AVS_IPC_RET(ret);
}
}
@@ -1426,7 +1428,8 @@ int avs_path_unbind(struct avs_path *path)
sink->instance_id, binding->sink_pin,
binding->source_pin);
if (ret) {
- dev_err(adev->dev, "unbind path failed: %d\n", ret);
+ dev_err(adev->dev, "unbind path %s failed: %d\n",
+ avs_path_name(path), ret);
return AVS_IPC_RET(ret);
}
}
@@ -1448,7 +1451,7 @@ int avs_path_reset(struct avs_path *path)
ret = avs_ipc_set_pipeline_state(adev, ppl->instance_id,
AVS_PPL_STATE_RESET);
if (ret) {
- dev_err(adev->dev, "reset path failed: %d\n", ret);
+ dev_err(adev->dev, "reset path %s failed: %d\n", avs_path_name(path), ret);
path->state = AVS_PPL_STATE_INVALID;
return AVS_IPC_RET(ret);
}
@@ -1507,7 +1510,7 @@ int avs_path_pause(struct avs_path *path)
ret = avs_ipc_set_pipeline_state(adev, ppl->instance_id,
AVS_PPL_STATE_PAUSED);
if (ret) {
- dev_err(adev->dev, "pause path failed: %d\n", ret);
+ dev_err(adev->dev, "pause path %s failed: %d\n", avs_path_name(path), ret);
path->state = AVS_PPL_STATE_INVALID;
return AVS_IPC_RET(ret);
}
@@ -1575,7 +1578,7 @@ int avs_path_run(struct avs_path *path, int trigger)
ret = avs_ipc_set_pipeline_state(adev, ppl->instance_id,
AVS_PPL_STATE_RUNNING);
if (ret) {
- dev_err(adev->dev, "run path failed: %d\n", ret);
+ dev_err(adev->dev, "run path %s failed: %d\n", avs_path_name(path), ret);
path->state = AVS_PPL_STATE_INVALID;
return AVS_IPC_RET(ret);
}
diff --git a/sound/soc/intel/avs/pcm.c b/sound/soc/intel/avs/pcm.c
index b0796d18c1c4..360cb8125bcc 100644
--- a/sound/soc/intel/avs/pcm.c
+++ b/sound/soc/intel/avs/pcm.c
@@ -227,15 +227,10 @@ static int avs_dai_prepare(struct snd_pcm_substream *substream, struct snd_soc_d
return 0;

ret = avs_path_reset(data->path);
- if (ret < 0) {
- dev_err(dai->dev, "reset path failed: %d\n", ret);
+ if (ret < 0)
return ret;
- }

- ret = avs_path_pause(data->path);
- if (ret < 0)
- dev_err(dai->dev, "pause path failed: %d\n", ret);
- return ret;
+ return avs_path_pause(data->path);
}

static int avs_dai_nonhda_be_hw_params(struct snd_pcm_substream *substream,
@@ -283,14 +278,10 @@ static int avs_dai_nonhda_be_trigger(struct snd_pcm_substream *substream, int cm
case SNDRV_PCM_TRIGGER_START:
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
ret = avs_path_pause(data->path);
- if (ret < 0) {
- dev_err(dai->dev, "pause BE path failed: %d\n", ret);
+ if (ret < 0)
break;
- }

ret = avs_path_run(data->path, AVS_TPLG_TRIGGER_AUTO);
- if (ret < 0)
- dev_err(dai->dev, "run BE path failed: %d\n", ret);
break;

case SNDRV_PCM_TRIGGER_SUSPEND:
@@ -300,12 +291,8 @@ static int avs_dai_nonhda_be_trigger(struct snd_pcm_substream *substream, int cm
case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
case SNDRV_PCM_TRIGGER_STOP:
ret = avs_path_pause(data->path);
- if (ret < 0)
- dev_err(dai->dev, "pause BE path failed: %d\n", ret);

ret2 = avs_path_reset(data->path);
- if (ret2)
- dev_err(dai->dev, "reset BE path failed: %d\n", ret2);
if (ret2 && !ret)
ret = ret2;
break;
@@ -510,14 +497,10 @@ static int avs_dai_hda_be_trigger(struct snd_pcm_substream *substream, int cmd,
snd_hdac_ext_stream_start(data->link_stream);

ret = avs_path_pause(data->path);
- if (ret < 0) {
- dev_err(dai->dev, "pause BE path failed: %d\n", ret);
+ if (ret < 0)
break;
- }

ret = avs_path_run(data->path, AVS_TPLG_TRIGGER_AUTO);
- if (ret < 0)
- dev_err(dai->dev, "run BE path failed: %d\n", ret);
break;

case SNDRV_PCM_TRIGGER_SUSPEND:
@@ -527,14 +510,10 @@ static int avs_dai_hda_be_trigger(struct snd_pcm_substream *substream, int cmd,
case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
case SNDRV_PCM_TRIGGER_STOP:
ret = avs_path_pause(data->path);
- if (ret < 0)
- dev_err(dai->dev, "pause BE path failed: %d\n", ret);

snd_hdac_ext_stream_clear(data->link_stream);

ret2 = avs_path_reset(data->path);
- if (ret2)
- dev_err(dai->dev, "reset BE path failed: %d\n", ret2);
if (ret2 && !ret)
ret = ret2;
break;
@@ -696,10 +675,8 @@ static int avs_dai_fe_hw_params(struct snd_pcm_substream *substream,
goto create_err;

ret = avs_path_bind(data->path);
- if (ret < 0) {
- dev_err(dai->dev, "bind FE <-> BE failed: %d\n", ret);
+ if (ret < 0)
goto bind_err;
- }

return 0;

@@ -727,11 +704,9 @@ static int __avs_dai_fe_hw_free(struct snd_pcm_substream *substream, struct snd_
host_stream = data->host_stream;

ret = avs_path_unbind(data->path);
- if (ret < 0)
- dev_err(dai->dev, "unbind FE <-> BE failed: %d\n", ret);
-
avs_path_free(data->path);
data->path = NULL;
+
snd_hdac_stream_cleanup(hdac_stream(host_stream));
hdac_stream(host_stream)->prepared = false;

@@ -894,15 +869,10 @@ static int avs_dai_fe_trigger(struct snd_pcm_substream *substream, int cmd, stru
snd_hdac_stream_wait_drsm(hdac_stream(host_stream));

ret = avs_path_pause(data->path);
- if (ret < 0) {
- dev_err(dai->dev, "pause FE path failed: %d\n", ret);
+ if (ret < 0)
break;
- }

ret = avs_path_run(data->path, AVS_TPLG_TRIGGER_AUTO);
- if (ret < 0)
- dev_err(dai->dev, "run FE path failed: %d\n", ret);
-
break;

case SNDRV_PCM_TRIGGER_SUSPEND:
@@ -912,16 +882,12 @@ static int avs_dai_fe_trigger(struct snd_pcm_substream *substream, int cmd, stru
case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
case SNDRV_PCM_TRIGGER_STOP:
ret = avs_path_pause(data->path);
- if (ret < 0)
- dev_err(dai->dev, "pause FE path failed: %d\n", ret);

spin_lock_irqsave(&bus->reg_lock, flags);
avs_hda_stream_stop(bus, host_stream);
spin_unlock_irqrestore(&bus->reg_lock, flags);

ret2 = avs_path_reset(data->path);
- if (ret2)
- dev_err(dai->dev, "reset FE path failed: %d\n", ret2);
if (ret2 && !ret)
ret = ret2;
break;
--
2.34.1