ASoC: renesas: rz-ssi: Use proper dma_buffer_pos after resume

When the driver supports DMA, it enqueues four DMA descriptors per
substream before the substream is started. New descriptors are enqueued in
the DMA completion callback, and each time a new descriptor is queued, the
dma_buffer_pos is incremented.

During suspend, the DMA transactions are terminated. There might be cases
where the four extra enqueued DMA descriptors are not completed and are
instead canceled on suspend. However, the cancel operation does not take
into account that the dma_buffer_pos was already incremented.

Previously, the suspend code reinitialized dma_buffer_pos to zero, but this
is not always correct.

To avoid losing any audio periods during suspend/resume and to prevent
clip sound, save the completed DMA buffer position in the DMA callback and
reinitialize dma_buffer_pos on resume.

Cc: stable@vger.kernel.org
Fixes: 1fc778f7c833a ("ASoC: renesas: rz-ssi: Add suspend to RAM support")
Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Link: https://patch.msgid.link/20251029141134.2556926-3-claudiu.beznea.uj@bp.renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/renesas/rz-ssi.c b/sound/soc/renesas/rz-ssi.c
index e009408141570ea5e5ebf782d834033aa48cb13f..81b883e8ac92aaea85287197a22f5e4738f93589 100644 (file)
--- a/sound/soc/renesas/rz-ssi.c
+++ b/sound/soc/renesas/rz-ssi.c
@@ -85,6 +85,7 @@ struct rz_ssi_stream {
        struct snd_pcm_substream *substream;
        int fifo_sample_size;   /* sample capacity of SSI FIFO */
        int dma_buffer_pos;     /* The address for the next DMA descriptor */
+       int completed_dma_buf_pos; /* The address of the last completed DMA descriptor. */
        int period_counter;     /* for keeping track of periods transferred */
        int sample_width;
        int buffer_pos;         /* current frame position in the buffer */
@@ -215,6 +216,7 @@ static void rz_ssi_stream_init(struct rz_ssi_stream *strm,
        rz_ssi_set_substream(strm, substream);
        strm->sample_width = samples_to_bytes(runtime, 1);
        strm->dma_buffer_pos = 0;
+       strm->completed_dma_buf_pos = 0;
        strm->period_counter = 0;
        strm->buffer_pos = 0;
 
@@ -437,6 +439,10 @@ static void rz_ssi_pointer_update(struct rz_ssi_stream *strm, int frames)
                snd_pcm_period_elapsed(strm->substream);
                strm->period_counter = current_period;
        }
+
+       strm->completed_dma_buf_pos += runtime->period_size;
+       if (strm->completed_dma_buf_pos >= runtime->buffer_size)
+               strm->completed_dma_buf_pos = 0;
 }
 
 static int rz_ssi_pio_recv(struct rz_ssi_priv *ssi, struct rz_ssi_stream *strm)
@@ -778,10 +784,14 @@ no_dma:
        return -ENODEV;
 }
 
-static int rz_ssi_trigger_resume(struct rz_ssi_priv *ssi)
+static int rz_ssi_trigger_resume(struct rz_ssi_priv *ssi, struct rz_ssi_stream *strm)
 {
+       struct snd_pcm_substream *substream = strm->substream;
+       struct snd_pcm_runtime *runtime = substream->runtime;
        int ret;
 
+       strm->dma_buffer_pos = strm->completed_dma_buf_pos + runtime->period_size;
+
        if (rz_ssi_is_stream_running(&ssi->playback) ||
            rz_ssi_is_stream_running(&ssi->capture))
                return 0;
@@ -794,16 +804,6 @@ static int rz_ssi_trigger_resume(struct rz_ssi_priv *ssi)
                                ssi->hw_params_cache.channels);
 }
 
-static void rz_ssi_streams_suspend(struct rz_ssi_priv *ssi)
-{
-       if (rz_ssi_is_stream_running(&ssi->playback) ||
-           rz_ssi_is_stream_running(&ssi->capture))
-               return;
-
-       ssi->playback.dma_buffer_pos = 0;
-       ssi->capture.dma_buffer_pos = 0;
-}
-
 static int rz_ssi_dai_trigger(struct snd_pcm_substream *substream, int cmd,
                              struct snd_soc_dai *dai)
 {
@@ -813,7 +813,7 @@ static int rz_ssi_dai_trigger(struct snd_pcm_substream *substream, int cmd,
 
        switch (cmd) {
        case SNDRV_PCM_TRIGGER_RESUME:
-               ret = rz_ssi_trigger_resume(ssi);
+               ret = rz_ssi_trigger_resume(ssi, strm);
                if (ret)
                        return ret;
 
@@ -852,7 +852,6 @@ static int rz_ssi_dai_trigger(struct snd_pcm_substream *substream, int cmd,
 
        case SNDRV_PCM_TRIGGER_SUSPEND:
                rz_ssi_stop(ssi, strm);
-               rz_ssi_streams_suspend(ssi);
                break;
 
        case SNDRV_PCM_TRIGGER_STOP: