[Sound-open-firmware] [PATCH 7/7] ASoc: SOF: Add position update through memory window

[Xiuli Pan]

From: Pan Xiuli <xiuli.pan at linux.intel.com>

Read position info from memory window if stream region is available,
use IPC as a notify with msg id to determine which PCM is updating
position info.

Signed-off-by: Pan Xiuli <xiuli.pan at linux.intel.com>

---
Test with:
Mininow max rt5651 and GP-MRB nocodec
SOF master: 77ed88aa4a26c3ff6f479bf0894a13c87119ffdc
SOF-Tool master: 3105de2481b5b5511b2fa844fe859f023f434b4c
https://github.com/plbossart/sound/tree/topic/sof-v4.14:
d919ea06b7f79c95ab4eb68baf05e9faf3a894c1
---
 sound/soc/sof/ipc.c | 73 +++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 57 insertions(+), 16 deletions(-)

diff --git a/sound/soc/sof/ipc.c b/sound/soc/sof/ipc.c
index da427d1..d9dc36b 100644
--- a/sound/soc/sof/ipc.c
+++ b/sound/soc/sof/ipc.c
@@ -249,44 +249,80 @@ EXPORT_SYMBOL(snd_sof_dsp_mailbox_init);
 
 static void ipc_period_elapsed(struct snd_sof_dev *sdev, u32 msg_id)
 {
-	struct snd_sof_pcm *spcm;
 	struct sof_ipc_stream_posn posn;
+	struct snd_sof_pcm *spcm;
+	u32 posn_offset;
 	int direction;
 
-	/* read back full message */
-	snd_sof_dsp_mailbox_read(sdev, sdev->dsp_box.offset, &posn,
-				 sizeof(posn));
-	dev_dbg(sdev->dev,  "posn: host 0x%llx dai 0x%llx wall 0x%llx\n",
-		posn.host_posn, posn.dai_posn, posn.wallclock);
+	/* check if we have stream box */
+	if (sdev->stream_box.size == 0) {
+		/* read back full message */
+		snd_sof_dsp_mailbox_read(sdev, sdev->dsp_box.offset, &posn,
+					 sizeof(posn));
+
+		spcm = snd_sof_find_spcm_comp(sdev, posn.comp_id, &direction);
+	} else {
+		spcm = snd_sof_find_spcm_comp(sdev, msg_id, &direction);
+	}
 
-	spcm = snd_sof_find_spcm_comp(sdev, posn.comp_id, &direction);
 	if (!spcm) {
-		dev_err(sdev->dev, "error: period elapsed for unknown component %d\n",
+		dev_err(sdev->dev,
+			"error: period elapsed for unknown component %d\n",
 			posn.comp_id);
 		return;
 	}
 
+	/* have stream box read from stream box */
+	if (sdev->stream_box.size != 0) {
+		posn_offset = spcm->posn_offset[direction];
+		snd_sof_dsp_mailbox_read(sdev, posn_offset, &posn,
+					 sizeof(posn));
+
+		dev_dbg(sdev->dev, "posn mailbox: posn offset is 0x%x",
+			posn_offset);
+	}
+
+	dev_dbg(sdev->dev, "posn : host 0x%llx dai 0x%llx wall 0x%llx\n",
+		posn.host_posn, posn.dai_posn, posn.wallclock);
+
 	memcpy(&spcm->stream[direction].posn, &posn, sizeof(posn));
 	snd_pcm_period_elapsed(spcm->stream[direction].substream);
 }
 
 static void ipc_xrun(struct snd_sof_dev *sdev, u32 msg_id)
 {
-	struct snd_sof_pcm *spcm;
 	struct sof_ipc_stream_posn posn;
+	struct snd_sof_pcm *spcm;
+	u32 posn_offset;
 	int direction;
 
-	/* read back full message */
-	snd_sof_dsp_mailbox_read(sdev, sdev->dsp_box.offset, &posn,
-				 sizeof(posn));
+	/* check if we have stream box */
+	if (sdev->stream_box.size == 0) {
+		/* read back full message */
+		snd_sof_dsp_mailbox_read(sdev, sdev->dsp_box.offset, &posn,
+					 sizeof(posn));
+
+		spcm = snd_sof_find_spcm_comp(sdev, posn.comp_id, &direction);
+	} else {
+		spcm = snd_sof_find_spcm_comp(sdev, msg_id, &direction);
+	}
 
-	spcm = snd_sof_find_spcm_comp(sdev, posn.comp_id, &direction);
 	if (!spcm) {
 		dev_err(sdev->dev, "error: XRUN for unknown component %d\n",
 			posn.comp_id);
 		return;
 	}
 
+	/* have stream box read from stream box */
+	if (sdev->stream_box.size != 0) {
+		posn_offset = spcm->posn_offset[direction];
+		snd_sof_dsp_mailbox_read(sdev, posn_offset, &posn,
+					 sizeof(posn));
+
+		dev_dbg(sdev->dev, "posn mailbox: posn offset is 0x%x",
+			posn_offset);
+	}
+
 	dev_dbg(sdev->dev,  "posn XRUN: host %llx comp %d size %d\n",
 		posn.host_posn, posn.xrun_comp_id, posn.xrun_size);
 
@@ -296,9 +332,13 @@ static void ipc_xrun(struct snd_sof_dev *sdev, u32 msg_id)
 	snd_pcm_stop_xrun(spcm->stream[direction].substream);
 }
 
-static void ipc_stream_message(struct snd_sof_dev *sdev, u32 msg_id)
+static void ipc_stream_message(struct snd_sof_dev *sdev, u32 msg_cmd)
 {
-	switch (msg_id) {
+	/* get msg cmd type and msd id */
+	u32 msg_type = msg_cmd & SOF_CMD_TYPE_MASK;
+	u32 msg_id = SOF_IPC_MESSAGE_ID(msg_cmd);
+
+	switch (msg_type) {
 	case SOF_IPC_STREAM_POSITION:
 		ipc_period_elapsed(sdev, msg_id);
 		break;
@@ -372,7 +412,8 @@ static void ipc_msgs_rx(struct work_struct *work)
 	case SOF_IPC_GLB_COMP_MSG:
 		break;
 	case SOF_IPC_GLB_STREAM_MSG:
-		ipc_stream_message(sdev, type);
+		/* need to pass msg id into the function */
+		ipc_stream_message(sdev, hdr.cmd);
 		break;
 	case SOF_IPC_GLB_TRACE_MSG:
 		ipc_trace_message(sdev, type);
-- 
2.7.4