ASoC: SOF: append extended data to sof_ipc_comp_volume

Append the extended data to the end of the struct sof_ipc_comp_volume,
construct the ipc for COMP_NEW during the topology load stage.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20200904132744.1699575-10-kai.vehmanen@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c
index eaad7a60f4b2d4500ddff4328425d4f39aed379a..c908dbbe284a84e37987645e636d2ef8a91f51a9 100644 (file)
--- a/sound/soc/sof/topology.c
+++ b/sound/soc/sof/topology.c
@@ -1878,11 +1878,13 @@ static int sof_widget_load_pga(struct snd_soc_component *scomp, int index,
        struct snd_soc_tplg_private *private = &tw->priv;
        struct sof_ipc_comp_volume *volume;
        struct snd_sof_control *scontrol;
+       size_t ipc_size = sizeof(*volume);
        int min_step;
        int max_step;
        int ret;
 
-       volume = kzalloc(sizeof(*volume), GFP_KERNEL);
+       volume = (struct sof_ipc_comp_volume *)
+                sof_comp_alloc(swidget, &ipc_size, index, core);
        if (!volume)
                return -ENOMEM;
 
@@ -1894,12 +1896,7 @@ static int sof_widget_load_pga(struct snd_soc_component *scomp, int index,
        }
 
        /* configure volume IPC message */
-       volume->comp.hdr.size = sizeof(*volume);
-       volume->comp.hdr.cmd = SOF_IPC_GLB_TPLG_MSG | SOF_IPC_TPLG_COMP_NEW;
-       volume->comp.id = swidget->comp_id;
        volume->comp.type = SOF_COMP_VOLUME;
-       volume->comp.pipeline_id = index;
-       volume->comp.core = core;
        volume->config.hdr.size = sizeof(volume->config);
 
        ret = sof_parse_tokens(scomp, volume, volume_tokens,
@@ -1936,7 +1933,7 @@ static int sof_widget_load_pga(struct snd_soc_component *scomp, int index,
        }
 
        ret = sof_ipc_tx_message(sdev->ipc, volume->comp.hdr.cmd, volume,
-                                sizeof(*volume), r, sizeof(*r));
+                                ipc_size, r, sizeof(*r));
        if (ret >= 0)
                return ret;
 err: