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

ASoC: SOF: append extended data to sof_ipc_comp_mux 



Append the extended data to the end of the struct sof_ipc_comp_mux,
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-16-kai.vehmanen@linux.intel.com


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

sound/soc/sof/topology.c

+4 −7
Original line number Diff line number Diff line
@@ -1825,19 +1825,16 @@ static int sof_widget_load_mux(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_mux *mux;

	size_t ipc_size = sizeof(*mux);

	int ret;



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

	mux = (struct sof_ipc_comp_mux *)

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

	if (!mux)

		return -ENOMEM;



	/* configure mux IPC message */

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

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

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

	mux->comp.type = SOF_COMP_MUX;

	mux->comp.pipeline_id = index;

	mux->comp.core = core;

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



	ret = sof_parse_tokens(scomp, &mux->config, comp_tokens,
@@ -1855,7 +1852,7 @@ static int sof_widget_load_mux(struct snd_soc_component *scomp, int index, 
	swidget->private = mux;



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

				 sizeof(*mux), r, sizeof(*r));

				 ipc_size, r, sizeof(*r));

	if (ret < 0)

		kfree(mux);

CRA Git | Maintained and supported by SUSTech CRA and CCSE