LF-3774-3 ASoC: SOF: Fix sof_ipc_msg_data for compress streams

sof_ipc_msg_data relies on sof_pcm_stream to retrieve the Host position
offset. This doesn't work for compress audio.

For compressed audio we need to retrieve position offset from
sof_compr_stream.

Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>

diff --git a/sound/soc/sof/compress.c b/sound/soc/sof/compress.c
index 4d3890e..a7de209 100644 (file)
--- a/sound/soc/sof/compress.c
+++ b/sound/soc/sof/compress.c
@@ -10,11 +10,6 @@
 #include "sof-audio.h"
 #include "sof-priv.h"
 
-struct sof_compr_stream {
-       unsigned int copied_total;
-       unsigned int sample_rate;
-};
-
 static void sof_set_transferred_bytes(struct sof_compr_stream *sstream,
                                      u64 host_pos, u64 buffer_size)
 {
@@ -185,6 +180,7 @@ int sof_compr_set_params(struct snd_soc_component *component,
                return ret;
        }
 
+       sstream->posn_offset = sdev->stream_box.offset + ipc_params_reply.posn_offset;
        sstream->sample_rate = params->codec.sample_rate;
        spcm->prepared[cstream->direction] = true;
 

diff --git a/sound/soc/sof/ipc-stream.c b/sound/soc/sof/ipc-stream.c
index 497c082..6e5e983 100644 (file)
--- a/sound/soc/sof/ipc-stream.c
+++ b/sound/soc/sof/ipc-stream.c
@@ -34,11 +34,21 @@ void sof_ipc_msg_data(struct snd_sof_dev *sdev,
                sof_mailbox_read(sdev, sdev->dsp_box.offset, p, sz);
        } else {
                struct snd_pcm_substream *substream = sps->substream;
-               struct sof_pcm_stream *stream = substream->runtime->private_data;
-
+               struct snd_compr_stream *cstream = sps->cstream;
+               struct sof_pcm_stream *pstream;
+               struct sof_compr_stream *sstream;
+               size_t posn_offset;
+
+               if (substream) {
+                       pstream = substream->runtime->private_data;
+                       posn_offset = pstream->posn_offset;
+               } else {
+                       sstream = cstream->runtime->private_data;
+                       posn_offset = sstream->posn_offset;
+               }
                /* The stream might already be closed */
-               if (stream)
-                       sof_mailbox_read(sdev, stream->posn_offset, p, sz);
+               if (pstream || sstream)
+                       sof_mailbox_read(sdev, posn_offset, p, sz);
        }
 }
 EXPORT_SYMBOL(sof_ipc_msg_data);

diff --git a/sound/soc/sof/sof-priv.h b/sound/soc/sof/sof-priv.h
index 9d2e6f1..86a7ab3 100644 (file)
--- a/sound/soc/sof/sof-priv.h
+++ b/sound/soc/sof/sof-priv.h
@@ -81,6 +81,12 @@ enum sof_system_suspend_state {
        SOF_SUSPEND_S3,
 };
 
+struct sof_compr_stream {
+       unsigned int copied_total;
+       unsigned int sample_rate;
+       size_t posn_offset;
+};
+
 struct snd_sof_dev;
 struct snd_sof_ipc_msg;
 struct snd_sof_ipc;