Unverified Commit 4457fbd6 authored by Mark Brown's avatar Mark Brown
Browse files

Extend ipc stream parameters sent to DSP 

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

From: Daniel Baluta <daniel.baluta@nxp.com>

We need a way to send extra parameters to DSP firmware. In order to do
this, we introduce ext_data array at the end of ipc_stream_params.

With this new addition we can send compress parameters.

This requires SOF ABI bump.
parents 501935da 75b5b7a1

include/sound/sof/stream.h

+4 −2
Original line number Diff line number Diff line
@@ -86,9 +86,11 @@ struct sof_ipc_stream_params { 
	uint32_t host_period_bytes;

	uint16_t no_stream_position; /**< 1 means don't send stream position */

	uint8_t cont_update_posn; /**< 1 means continuous update stream position */



	uint8_t reserved[5];

	uint8_t reserved0;

	int16_t ext_data_length; /**< 0, means no extended data */

	uint8_t reserved[2];

	uint16_t chmap[SOF_IPC_MAX_CHANNELS];	/**< channel map - SOF_CHMAP_ */

	uint8_t ext_data[]; /**< extended data */

} __packed;



/* PCM params info - SOF_IPC_STREAM_PCM_PARAMS */

include/uapi/sound/sof/abi.h

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 


/* SOF ABI version major, minor and patch numbers */

#define SOF_ABI_MAJOR 3

#define SOF_ABI_MINOR 21

#define SOF_ABI_MINOR 22

#define SOF_ABI_PATCH 0



/* SOF ABI version number. Format within 32bit word is MMmmmppp */

sound/soc/sof/compress.c

+49 −24
Original line number Diff line number Diff line
@@ -167,11 +167,23 @@ static int sof_compr_set_params(struct snd_soc_component *component, 
	struct snd_soc_pcm_runtime *rtd = cstream->private_data;

	struct snd_compr_runtime *crtd = cstream->runtime;

	struct sof_ipc_pcm_params_reply ipc_params_reply;

	struct sof_ipc_fw_ready *ready = &sdev->fw_ready;

	struct sof_ipc_fw_version *v = &ready->version;

	struct snd_compr_tstamp *tstamp;

	struct sof_ipc_pcm_params pcm;

	struct sof_ipc_pcm_params *pcm;

	struct snd_sof_pcm *spcm;

	size_t ext_data_size;

	int ret;



	if (v->abi_version < SOF_ABI_VER(3, 22, 0)) {

		dev_err(component->dev,

			"Compress params not supported with FW ABI version %d:%d:%d\n",

			SOF_ABI_VERSION_MAJOR(v->abi_version),

			SOF_ABI_VERSION_MINOR(v->abi_version),

			SOF_ABI_VERSION_PATCH(v->abi_version));

		return -EINVAL;

	}



	tstamp = crtd->private_data;



	spcm = snd_sof_find_spcm_dai(component, rtd);
@@ -179,40 +191,50 @@ static int sof_compr_set_params(struct snd_soc_component *component, 
	if (!spcm)

		return -EINVAL;



	ext_data_size = sizeof(params->codec);



	if (sizeof(*pcm) + ext_data_size > sdev->ipc->max_payload_size)

		return -EINVAL;



	pcm = kzalloc(sizeof(*pcm) + ext_data_size, GFP_KERNEL);

	if (!pcm)

		return -ENOMEM;



	cstream->dma_buffer.dev.type = SNDRV_DMA_TYPE_DEV_SG;

	cstream->dma_buffer.dev.dev = sdev->dev;

	ret = snd_compr_malloc_pages(cstream, crtd->buffer_size);

	if (ret < 0)

		return ret;

		goto out;



	ret = create_page_table(component, cstream, crtd->dma_area, crtd->dma_bytes);

	if (ret < 0)

		return ret;



	memset(&pcm, 0, sizeof(pcm));



	pcm.params.buffer.pages = PFN_UP(crtd->dma_bytes);

	pcm.hdr.size = sizeof(pcm);

	pcm.hdr.cmd = SOF_IPC_GLB_STREAM_MSG | SOF_IPC_STREAM_PCM_PARAMS;



	pcm.comp_id = spcm->stream[cstream->direction].comp_id;

	pcm.params.hdr.size = sizeof(pcm.params);

	pcm.params.buffer.phy_addr = spcm->stream[cstream->direction].page_table.addr;

	pcm.params.buffer.size = crtd->dma_bytes;

	pcm.params.direction = cstream->direction;

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

	pcm.params.rate = params->codec.sample_rate;

	pcm.params.buffer_fmt = SOF_IPC_BUFFER_INTERLEAVED;

	pcm.params.frame_fmt = SOF_IPC_FRAME_S32_LE;

	pcm.params.sample_container_bytes =

		goto out;



	pcm->params.buffer.pages = PFN_UP(crtd->dma_bytes);

	pcm->hdr.size = sizeof(*pcm) + ext_data_size;

	pcm->hdr.cmd = SOF_IPC_GLB_STREAM_MSG | SOF_IPC_STREAM_PCM_PARAMS;



	pcm->comp_id = spcm->stream[cstream->direction].comp_id;

	pcm->params.hdr.size = sizeof(pcm->params) + ext_data_size;

	pcm->params.buffer.phy_addr = spcm->stream[cstream->direction].page_table.addr;

	pcm->params.buffer.size = crtd->dma_bytes;

	pcm->params.direction = cstream->direction;

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

	pcm->params.rate = params->codec.sample_rate;

	pcm->params.buffer_fmt = SOF_IPC_BUFFER_INTERLEAVED;

	pcm->params.frame_fmt = SOF_IPC_FRAME_S32_LE;

	pcm->params.sample_container_bytes =

		snd_pcm_format_physical_width(SNDRV_PCM_FORMAT_S32) >> 3;

	pcm.params.host_period_bytes = params->buffer.fragment_size;

	pcm->params.host_period_bytes = params->buffer.fragment_size;

	pcm->params.ext_data_length = ext_data_size;



	memcpy((u8 *)pcm->params.ext_data, &params->codec, ext_data_size);



	ret = sof_ipc_tx_message(sdev->ipc, &pcm, sizeof(pcm),

	ret = sof_ipc_tx_message(sdev->ipc, pcm, sizeof(*pcm) + ext_data_size,

				 &ipc_params_reply, sizeof(ipc_params_reply));

	if (ret < 0) {

		dev_err(component->dev, "error ipc failed\n");

		return ret;

		goto out;

	}



	tstamp->byte_offset = sdev->stream_box.offset + ipc_params_reply.posn_offset;
@@ -220,7 +242,10 @@ static int sof_compr_set_params(struct snd_soc_component *component, 


	spcm->prepared[cstream->direction] = true;



	return 0;

out:

	kfree(pcm);



	return ret;

}



static int sof_compr_get_params(struct snd_soc_component *component,