Unverified Commit 1b905942 authored by Daniel Baluta's avatar Daniel Baluta Committed by Mark Brown
Browse files

ASoC: SOF: Prepare ipc_msg_data to be used with compress API 



Make second parameter of ipc_msg_data generic
in order to be able to support compressed streams.

This patch doesn't hold any functional change.

With this case we can use ipc_msg_data, to retrieve information from
DSP for both PCM/Compress API.

Reviewed-by: default avatarPaul Olaru <paul.olaru@nxp.com>
Reviewed-by: default avatarIuliana Prodan <iuliana.prodan@nxp.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: default avatarDaniel Baluta <daniel.baluta@nxp.com>
Link: https://lore.kernel.org/r/20230117122533.201708-2-daniel.baluta@oss.nxp.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 73845585

sound/soc/sof/amd/acp-ipc.c

+3 −2
Original line number Diff line number Diff line
@@ -200,14 +200,15 @@ irqreturn_t acp_sof_ipc_irq_thread(int irq, void *context) 
}

EXPORT_SYMBOL_NS(acp_sof_ipc_irq_thread, SND_SOC_SOF_AMD_COMMON);



int acp_sof_ipc_msg_data(struct snd_sof_dev *sdev, struct snd_pcm_substream *substream,

int acp_sof_ipc_msg_data(struct snd_sof_dev *sdev, struct snd_sof_pcm_stream *sps,

			 void *p, size_t sz)

{

	unsigned int offset = sdev->dsp_box.offset;



	if (!substream || !sdev->stream_box.size) {

	if (!sps || !sdev->stream_box.size) {

		acp_mailbox_read(sdev, offset, p, sz);

	} else {

		struct snd_pcm_substream *substream = sps->substream;

		struct acp_dsp_stream *stream = substream->runtime->private_data;



		if (!stream)

sound/soc/sof/amd/acp.h

+2 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#define __SOF_AMD_ACP_H



#include "../sof-priv.h"

#include "../sof-audio.h"



#define ACP_MAX_STREAM	8
@@ -211,7 +212,7 @@ int acp_dsp_block_read(struct snd_sof_dev *sdev, enum snd_sof_fw_blk_type blk_ty 


/* IPC callbacks */

irqreturn_t acp_sof_ipc_irq_thread(int irq, void *context);

int acp_sof_ipc_msg_data(struct snd_sof_dev *sdev, struct snd_pcm_substream *substream,

int acp_sof_ipc_msg_data(struct snd_sof_dev *sdev, struct snd_sof_pcm_stream *sps,

			 void *p, size_t sz);

int acp_set_stream_data_offset(struct snd_sof_dev *sdev,

			       struct snd_pcm_substream *substream,

sound/soc/sof/intel/hda-ipc.c

+3 −2
Original line number Diff line number Diff line
@@ -361,12 +361,13 @@ int hda_dsp_ipc_get_window_offset(struct snd_sof_dev *sdev, u32 id) 
}



int hda_ipc_msg_data(struct snd_sof_dev *sdev,

		     struct snd_pcm_substream *substream,

		     struct snd_sof_pcm_stream *sps,

		     void *p, size_t sz)

{

	if (!substream || !sdev->stream_box.size) {

	if (!sps || !sdev->stream_box.size) {

		sof_mailbox_read(sdev, sdev->dsp_box.offset, p, sz);

	} else {

		struct snd_pcm_substream *substream = sps->substream;

		struct hdac_stream *hstream = substream->runtime->private_data;

		struct sof_intel_hda_stream *hda_stream;

sound/soc/sof/intel/hda.h

+1 −1
Original line number Diff line number Diff line
@@ -656,7 +656,7 @@ int hda_dsp_stream_spib_config(struct snd_sof_dev *sdev, 
			       int enable, u32 size);



int hda_ipc_msg_data(struct snd_sof_dev *sdev,

		     struct snd_pcm_substream *substream,

		     struct snd_sof_pcm_stream *sps,

		     void *p, size_t sz);

int hda_set_stream_data_offset(struct snd_sof_dev *sdev,

			       struct snd_pcm_substream *substream,

sound/soc/sof/ipc3.c

+2 −2
Original line number Diff line number Diff line
@@ -847,7 +847,7 @@ static void ipc3_period_elapsed(struct snd_sof_dev *sdev, u32 msg_id) 
	}



	stream = &spcm->stream[direction];

	ret = snd_sof_ipc_msg_data(sdev, stream->substream, &posn, sizeof(posn));

	ret = snd_sof_ipc_msg_data(sdev, stream, &posn, sizeof(posn));

	if (ret < 0) {

		dev_warn(sdev->dev, "failed to read stream position: %d\n", ret);

		return;
@@ -882,7 +882,7 @@ static void ipc3_xrun(struct snd_sof_dev *sdev, u32 msg_id) 
	}



	stream = &spcm->stream[direction];

	ret = snd_sof_ipc_msg_data(sdev, stream->substream, &posn, sizeof(posn));

	ret = snd_sof_ipc_msg_data(sdev, stream, &posn, sizeof(posn));

	if (ret < 0) {

		dev_warn(sdev->dev, "failed to read overrun position: %d\n", ret);

		return;