ASoC: SOF: ipc4-pcm: Enable delay reporting for ChainDMA streams

[ Upstream commit a1d203d390e04798ccc1c3c06019cd4411885d6d ]

All streams (currently) which is configured to use ChainDMA can only work
on Link/host DMA pairs where the link side position can be access via host
registers (like HDA on CAVS 2.5 platforms).

Since the firmware does not provide time_info for ChainDMA, unlike for HDA
stream, the kernel should calculate the start and end offsets that is
needed for the delay calculation.

With this small change we can report accurate delays when the stream is
configured to use ChainDMA.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Liam Girdwood <liam.r.girdwood@intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://patch.msgid.link/20250619102848.12389-1-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Stable-dep-of: bcd1383516bb ("ASoC: SOF: ipc4-pcm: fix delay calculation when DSP resamples")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/sound/soc/sof/ipc4-pcm.c b/sound/soc/sof/ipc4-pcm.c
index 9db2cdb3212822d1ac146b98ec54d3afb6f665f2..2a08aa80e1de51a08f87df06f88279a5b4aae705 100644 (file)
--- a/sound/soc/sof/ipc4-pcm.c
+++ b/sound/soc/sof/ipc4-pcm.c
@@ -409,9 +409,33 @@ static int sof_ipc4_trigger_pipelines(struct snd_soc_component *component,
         * If use_chain_dma attribute is set we proceed to chained DMA
         * trigger function that handles the rest for the substream.
         */
-       if (pipeline->use_chain_dma)
-               return sof_ipc4_chain_dma_trigger(sdev, spcm, substream->stream,
-                                                 pipeline_list, state, cmd);
+       if (pipeline->use_chain_dma) {
+               struct sof_ipc4_timestamp_info *time_info;
+
+               time_info = sof_ipc4_sps_to_time_info(&spcm->stream[substream->stream]);
+
+               ret = sof_ipc4_chain_dma_trigger(sdev, spcm, substream->stream,
+                                                pipeline_list, state, cmd);
+               if (ret || !time_info)
+                       return ret;
+
+               if (state == SOF_IPC4_PIPE_PAUSED) {
+                       /*
+                        * Record the DAI position for delay reporting
+                        * To handle multiple pause/resume/xrun we need to add
+                        * the positions to simulate how the firmware behaves
+                        */
+                       u64 pos = snd_sof_pcm_get_dai_frame_counter(sdev, component,
+                                                                   substream);
+
+                       time_info->stream_end_offset += pos;
+               } else if (state == SOF_IPC4_PIPE_RESET) {
+                       /* Reset the end offset as the stream is stopped */
+                       time_info->stream_end_offset = 0;
+               }
+
+               return 0;
+       }
 
        /* allocate memory for the pipeline data */
        trigger_list = kzalloc(struct_size(trigger_list, pipeline_instance_ids,
@@ -924,8 +948,24 @@ static int sof_ipc4_get_stream_start_offset(struct snd_sof_dev *sdev,
        if (!host_copier || !dai_copier)
                return -EINVAL;
 
-       if (host_copier->data.gtw_cfg.node_id == SOF_IPC4_INVALID_NODE_ID)
+       if (host_copier->data.gtw_cfg.node_id == SOF_IPC4_INVALID_NODE_ID) {
                return -EINVAL;
+       } else if (host_copier->data.gtw_cfg.node_id == SOF_IPC4_CHAIN_DMA_NODE_ID) {
+               /*
+                * While the firmware does not supports time_info reporting for
+                * streams using ChainDMA, it is granted that ChainDMA can only
+                * be used on Host+Link pairs where the link position is
+                * accessible from the host side.
+                *
+                * Enable delay calculation in case of ChainDMA via host
+                * accessible registers.
+                *
+                * The ChainDMA uses 2x 1ms ping-pong buffer, dai side starts
+                * when 1ms data is available
+                */
+               time_info->stream_start_offset = substream->runtime->rate / MSEC_PER_SEC;
+               goto out;
+       }
 
        node_index = SOF_IPC4_NODE_INDEX(host_copier->data.gtw_cfg.node_id);
        offset = offsetof(struct sof_ipc4_fw_registers, pipeline_regs) + node_index * sizeof(ppl_reg);
@@ -943,6 +983,7 @@ static int sof_ipc4_get_stream_start_offset(struct snd_sof_dev *sdev,
        time_info->stream_end_offset = ppl_reg.stream_end_offset;
        do_div(time_info->stream_end_offset, dai_sample_size);
 
+out:
        /*
         * Calculate the wrap boundary need to be used for delay calculation
         * The host counter is in bytes, it will wrap earlier than the frames

diff --git a/sound/soc/sof/ipc4-topology.c b/sound/soc/sof/ipc4-topology.c
index ac836d0d20de0103d5cac06bef47e99952745420..cceacfbfb94771b08b2583267db438905d343fbe 100644 (file)
--- a/sound/soc/sof/ipc4-topology.c
+++ b/sound/soc/sof/ipc4-topology.c
@@ -1782,10 +1782,10 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
                        pipeline->msg.extension |= SOF_IPC4_GLB_EXT_CHAIN_DMA_FIFO_SIZE(fifo_size);
 
                        /*
-                        * Chain DMA does not support stream timestamping, set node_id to invalid
-                        * to skip the code in sof_ipc4_get_stream_start_offset().
+                        * Chain DMA does not support stream timestamping, but it
+                        * can use the host side registers for delay calculation.
                         */
-                       copier_data->gtw_cfg.node_id = SOF_IPC4_INVALID_NODE_ID;
+                       copier_data->gtw_cfg.node_id = SOF_IPC4_CHAIN_DMA_NODE_ID;
 
                        return 0;
                }

diff --git a/sound/soc/sof/ipc4-topology.h b/sound/soc/sof/ipc4-topology.h
index adb52a1eff85fc2a5301f403a874bc9f894afb41..18aef1dbec3bca706f921b36d0e422fe939f6ec0 100644 (file)
--- a/sound/soc/sof/ipc4-topology.h
+++ b/sound/soc/sof/ipc4-topology.h
@@ -58,6 +58,7 @@
 
 #define SOF_IPC4_DMA_DEVICE_MAX_COUNT 16
 
+#define SOF_IPC4_CHAIN_DMA_NODE_ID     0x7fffffff
 #define SOF_IPC4_INVALID_NODE_ID       0xffffffff
 
 /* FW requires minimum 4ms DMA buffer size */