Unverified Commit ae7c40bc authored by Mark Brown's avatar Mark Brown
Browse files

Add support to compress API to ipc_msg_data / 

Merge series from Daniel Baluta <daniel.baluta@oss.nxp.com>:

This patch series adds compress API support to ipc_msg_data /
set_stream_data_offset callbacks.

Changes since v1:
	- fixed reviewed-by list (+Peter, -Pierre). Since github had
	  some glitches I added the reviews received manually in the
          commits.
	- Github PR link: https://github.com/thesofproject/linux/pull/4133

Daniel Baluta (4):
  ASoC: SOF: Prepare ipc_msg_data to be used with compress API
  ASoC: SOF: Prepare set_stream_data_offset for compress API
  ASoC: SOF: Add support for compress API for stream data/offset
  ASoC: SOF: compress: Set compress data offset

 sound/soc/sof/amd/acp-ipc.c            |  8 ++--
 sound/soc/sof/amd/acp.h                |  5 ++-
 sound/soc/sof/compress.c               |  9 +++++
 sound/soc/sof/intel/hda-ipc.c          |  8 ++--
 sound/soc/sof/intel/hda.h              |  4 +-
 sound/soc/sof/ipc3-pcm.c               |  3 +-
 sound/soc/sof/ipc3.c                   |  4 +-
 sound/soc/sof/mediatek/mt8186/mt8186.c |  2 +-
 sound/soc/sof/mediatek/mt8195/mt8195.c |  2 +-
 sound/soc/sof/ops.h                    |  8 ++--
 sound/soc/sof/sof-priv.h               | 11 ++++--
 sound/soc/sof/stream-ipc.c             | 53 +++++++++++++++++++-------
 12 files changed, 81 insertions(+), 36 deletions(-)

--
2.25.1
parents 309d4014 a9737808

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

+5 −3
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)
@@ -221,9 +222,10 @@ int acp_sof_ipc_msg_data(struct snd_sof_dev *sdev, struct snd_pcm_substream *sub 
EXPORT_SYMBOL_NS(acp_sof_ipc_msg_data, SND_SOC_SOF_AMD_COMMON);



int acp_set_stream_data_offset(struct snd_sof_dev *sdev,

			       struct snd_pcm_substream *substream,

			       struct snd_sof_pcm_stream *sps,

			       size_t posn_offset)

{

	struct snd_pcm_substream *substream = sps->substream;

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



	/* check for unaligned offset or overflow */

sound/soc/sof/amd/acp.h

+3 −2
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,10 +212,10 @@ 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,

			       struct snd_sof_pcm_stream *sps,

			       size_t posn_offset);

int acp_sof_ipc_send_msg(struct snd_sof_dev *sdev,

			 struct snd_sof_ipc_msg *msg);

sound/soc/sof/compress.c

+9 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include "sof-audio.h"

#include "sof-priv.h"

#include "sof-utils.h"

#include "ops.h"



static void sof_set_transferred_bytes(struct sof_compr_stream *sstream,

				      u64 host_pos, u64 buffer_size)
@@ -237,6 +238,14 @@ static int sof_compr_set_params(struct snd_soc_component *component, 
		goto out;

	}



	ret = snd_sof_set_stream_data_offset(sdev, &spcm->stream[cstream->direction],

					     ipc_params_reply.posn_offset);

	if (ret < 0) {

		dev_err(component->dev, "Invalid stream data offset for Compr %d\n",

			spcm->pcm.pcm_id);

		goto out;

	}



	sstream->sampling_rate = params->codec.sample_rate;

	sstream->channels = params->codec.ch_out;

	sstream->sample_container_bytes = pcm->params.sample_container_bytes;

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

+5 −3
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;
@@ -385,9 +386,10 @@ int hda_ipc_msg_data(struct snd_sof_dev *sdev, 
}



int hda_set_stream_data_offset(struct snd_sof_dev *sdev,

			       struct snd_pcm_substream *substream,

			       struct snd_sof_pcm_stream *sps,

			       size_t posn_offset)

{

	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

+2 −2
Original line number Diff line number Diff line
@@ -656,10 +656,10 @@ 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,

			       struct snd_sof_pcm_stream *sps,

			       size_t posn_offset);



/*