ASoC: SOF: ipc4-pcm: Continue the pipeline trigger in case of IPC timeout

Ignore IPC errors for pipeline state change if the firmware state is
crashed or the IPC has timed out.

If the firmware has crashed the kernel still needs to go through the state
changes to reset its internal to be able to correctly work the next time
the DSP is booted up.

The case with IPC timeout is a bit more problematic, but it has been
rootcaused to be the result of system scheduling blockage and the firmware
did actually received and handled the message, but the reply handling got
blocked by issues outside of the SOF stack.
So far the best way to handle this is to continue with setting the state.

Fixes: c40aad7c81e5 ("ASoC: SOF: ipc4-pcm: Workaround for crashed firmware on system suspend")
Cc: stable@vger.kernel.org
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://patch.msgid.link/20260730112343.26687-1-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/ipc4-pcm.c b/sound/soc/sof/ipc4-pcm.c
index fc3ead77e5ea61222d10665c297d9b8a8ab82aba..5929ecf6642ee33b27deccb05db0180862246cbe 100644 (file)
--- a/sound/soc/sof/ipc4-pcm.c
+++ b/sound/soc/sof/ipc4-pcm.c
@@ -528,7 +528,19 @@ static int sof_ipc4_trigger_pipelines(struct snd_soc_component *component,
        ret = sof_ipc4_set_multi_pipeline_state(sdev, SOF_IPC4_PIPE_PAUSED, trigger_list);
        if (ret < 0) {
                spcm_err(spcm, substream->stream, "failed to pause all pipelines\n");
-               goto free;
+               /*
+                * workaround: if the firmware is crashed or the IPC timed out
+                * while setting the pipeline state we must ignore the error
+                * code and proceed to set adjust the local pipeline states.
+                *
+                * If the firmware is crashed we will not send IPC messages
+                * and we are going to see errors printed, but the state of the
+                * widgets will be correct for the next boot.
+                */
+               if (sdev->fw_state != SOF_FW_CRASHED && ret != -ETIMEDOUT)
+                       goto free;
+
+               ret = 0;
        }
 
        /* update PAUSED state for all pipelines just triggered */
@@ -560,14 +572,15 @@ skip_pause_transition:
                         "failed to set final state %d for all pipelines\n",
                         state);
                /*
-                * workaround: if the firmware is crashed while setting the
-                * pipelines to reset state we must ignore the error code and
-                * reset it to 0.
-                * Since the firmware is crashed we will not send IPC messages
+                * workaround: if the firmware is crashed or the IPC timed out
+                * while setting the pipeline state we must ignore the error
+                * code and proceed to set adjust the local pipeline states.
+                *
+                * If the firmware is crashed we will not send IPC messages
                 * and we are going to see errors printed, but the state of the
                 * widgets will be correct for the next boot.
                 */
-               if (sdev->fw_state != SOF_FW_CRASHED || state != SOF_IPC4_PIPE_RESET)
+               if (sdev->fw_state != SOF_FW_CRASHED && ret != -ETIMEDOUT)
                        goto free;
 
                ret = 0;