Merge tag 'sound-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[sfrench/cifs-2.6.git] / sound / soc / sof / compress.c

diff --git a/sound/soc/sof/compress.c b/sound/soc/sof/compress.c
index 47639b6344c8013ab6a3b48816c43ab8e3912b09..67139e15f862a114b0319ec88ddca489eac365a5 100644 (file)
--- a/sound/soc/sof/compress.c
+++ b/sound/soc/sof/compress.c
@@ -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,