Unverified Commit 3584ba4c authored by Keyon Jie's avatar Keyon Jie Committed by Mark Brown
Browse files

ASoC: SOF: append extended data to sof_ipc_comp_tone 



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

Signed-off-by: default avatarKeyon Jie <yang.jie@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20200904132744.1699575-14-kai.vehmanen@linux.intel.com


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

sound/soc/sof/topology.c

+4 −7
Original line number Diff line number Diff line
@@ -2066,19 +2066,16 @@ static int sof_widget_load_siggen(struct snd_soc_component *scomp, int index, 
	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);

	struct snd_soc_tplg_private *private = &tw->priv;

	struct sof_ipc_comp_tone *tone;

	size_t ipc_size = sizeof(*tone);

	int ret;



	tone = kzalloc(sizeof(*tone), GFP_KERNEL);

	tone = (struct sof_ipc_comp_tone *)

	       sof_comp_alloc(swidget, &ipc_size, index, core);

	if (!tone)

		return -ENOMEM;



	/* configure siggen IPC message */

	tone->comp.hdr.size = sizeof(*tone);

	tone->comp.hdr.cmd = SOF_IPC_GLB_TPLG_MSG | SOF_IPC_TPLG_COMP_NEW;

	tone->comp.id = swidget->comp_id;

	tone->comp.type = SOF_COMP_TONE;

	tone->comp.pipeline_id = index;

	tone->comp.core = core;

	tone->config.hdr.size = sizeof(tone->config);



	ret = sof_parse_tokens(scomp, tone, tone_tokens,
@@ -2106,7 +2103,7 @@ static int sof_widget_load_siggen(struct snd_soc_component *scomp, int index, 
	swidget->private = tone;



	ret = sof_ipc_tx_message(sdev->ipc, tone->comp.hdr.cmd, tone,

				 sizeof(*tone), r, sizeof(*r));

				 ipc_size, r, sizeof(*r));

	if (ret >= 0)

		return ret;

err: