Unverified Commit 753132f0 authored by Mark Brown's avatar Mark Brown
Browse files

Introduce IPC abstraction for SOF topology parsing 

Merge series from Ranjani Sridharan <ranjani.sridharan@linux.intel.com>:

This patchset makes the topology parsing layer in the SOF driver
IPC-agnostic in preparation for supporting the new IPC version
introduced in the SOF firmware. These patches purely contain abstraction
changes for the current IPC version (IPC3) supported and do not introduce
any functional changes.
parents 835ca597 61ad28ff

sound/soc/sof/Makefile

+2 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)



snd-sof-objs := core.o ops.o loader.o ipc.o pcm.o pm.o debug.o topology.o\

		control.o trace.o iomem-utils.o sof-audio.o stream-ipc.o

		control.o trace.o iomem-utils.o sof-audio.o stream-ipc.o\

		ipc3-topology.o

ifneq ($(CONFIG_SND_SOC_SOF_CLIENT),)

snd-sof-objs += sof-client.o

endif

sound/soc/sof/control.c

+13 −13
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static inline u32 ipc_to_mixer(u32 value, u32 *volume_map, int size) 


static void snd_sof_refresh_control(struct snd_sof_control *scontrol)

{

	struct sof_ipc_ctrl_data *cdata = scontrol->control_data;

	struct sof_ipc_ctrl_data *cdata = scontrol->ipc_control_data;

	struct snd_soc_component *scomp = scontrol->scomp;

	int ret;
@@ -97,7 +97,7 @@ int snd_sof_volume_get(struct snd_kcontrol *kcontrol, 
	struct soc_mixer_control *sm =

		(struct soc_mixer_control *)kcontrol->private_value;

	struct snd_sof_control *scontrol = sm->dobj.private;

	struct sof_ipc_ctrl_data *cdata = scontrol->control_data;

	struct sof_ipc_ctrl_data *cdata = scontrol->ipc_control_data;

	unsigned int i, channels = scontrol->num_channels;



	snd_sof_refresh_control(scontrol);
@@ -118,7 +118,7 @@ int snd_sof_volume_put(struct snd_kcontrol *kcontrol, 
		(struct soc_mixer_control *)kcontrol->private_value;

	struct snd_sof_control *scontrol = sm->dobj.private;

	struct snd_soc_component *scomp = scontrol->scomp;

	struct sof_ipc_ctrl_data *cdata = scontrol->control_data;

	struct sof_ipc_ctrl_data *cdata = scontrol->ipc_control_data;

	unsigned int i, channels = scontrol->num_channels;

	bool change = false;

	u32 value;
@@ -166,7 +166,7 @@ int snd_sof_switch_get(struct snd_kcontrol *kcontrol, 
	struct soc_mixer_control *sm =

		(struct soc_mixer_control *)kcontrol->private_value;

	struct snd_sof_control *scontrol = sm->dobj.private;

	struct sof_ipc_ctrl_data *cdata = scontrol->control_data;

	struct sof_ipc_ctrl_data *cdata = scontrol->ipc_control_data;

	unsigned int i, channels = scontrol->num_channels;



	snd_sof_refresh_control(scontrol);
@@ -185,7 +185,7 @@ int snd_sof_switch_put(struct snd_kcontrol *kcontrol, 
		(struct soc_mixer_control *)kcontrol->private_value;

	struct snd_sof_control *scontrol = sm->dobj.private;

	struct snd_soc_component *scomp = scontrol->scomp;

	struct sof_ipc_ctrl_data *cdata = scontrol->control_data;

	struct sof_ipc_ctrl_data *cdata = scontrol->ipc_control_data;

	unsigned int i, channels = scontrol->num_channels;

	bool change = false;

	u32 value;
@@ -214,7 +214,7 @@ int snd_sof_enum_get(struct snd_kcontrol *kcontrol, 
	struct soc_enum *se =

		(struct soc_enum *)kcontrol->private_value;

	struct snd_sof_control *scontrol = se->dobj.private;

	struct sof_ipc_ctrl_data *cdata = scontrol->control_data;

	struct sof_ipc_ctrl_data *cdata = scontrol->ipc_control_data;

	unsigned int i, channels = scontrol->num_channels;



	snd_sof_refresh_control(scontrol);
@@ -233,7 +233,7 @@ int snd_sof_enum_put(struct snd_kcontrol *kcontrol, 
		(struct soc_enum *)kcontrol->private_value;

	struct snd_sof_control *scontrol = se->dobj.private;

	struct snd_soc_component *scomp = scontrol->scomp;

	struct sof_ipc_ctrl_data *cdata = scontrol->control_data;

	struct sof_ipc_ctrl_data *cdata = scontrol->ipc_control_data;

	unsigned int i, channels = scontrol->num_channels;

	bool change = false;

	u32 value;
@@ -260,7 +260,7 @@ int snd_sof_bytes_get(struct snd_kcontrol *kcontrol, 
		(struct soc_bytes_ext *)kcontrol->private_value;

	struct snd_sof_control *scontrol = be->dobj.private;

	struct snd_soc_component *scomp = scontrol->scomp;

	struct sof_ipc_ctrl_data *cdata = scontrol->control_data;

	struct sof_ipc_ctrl_data *cdata = scontrol->ipc_control_data;

	struct sof_abi_hdr *data = cdata->data;

	size_t size;
@@ -296,7 +296,7 @@ int snd_sof_bytes_put(struct snd_kcontrol *kcontrol, 
		(struct soc_bytes_ext *)kcontrol->private_value;

	struct snd_sof_control *scontrol = be->dobj.private;

	struct snd_soc_component *scomp = scontrol->scomp;

	struct sof_ipc_ctrl_data *cdata = scontrol->control_data;

	struct sof_ipc_ctrl_data *cdata = scontrol->ipc_control_data;

	struct sof_abi_hdr *data = cdata->data;

	size_t size;
@@ -335,7 +335,7 @@ int snd_sof_bytes_ext_put(struct snd_kcontrol *kcontrol, 
		(struct soc_bytes_ext *)kcontrol->private_value;

	struct snd_sof_control *scontrol = be->dobj.private;

	struct snd_soc_component *scomp = scontrol->scomp;

	struct sof_ipc_ctrl_data *cdata = scontrol->control_data;

	struct sof_ipc_ctrl_data *cdata = scontrol->ipc_control_data;

	struct snd_ctl_tlv header;

	const struct snd_ctl_tlv __user *tlvd =

		(const struct snd_ctl_tlv __user *)binary_data;
@@ -409,7 +409,7 @@ int snd_sof_bytes_ext_volatile_get(struct snd_kcontrol *kcontrol, unsigned int _ 
	struct soc_bytes_ext *be = (struct soc_bytes_ext *)kcontrol->private_value;

	struct snd_sof_control *scontrol = be->dobj.private;

	struct snd_soc_component *scomp = scontrol->scomp;

	struct sof_ipc_ctrl_data *cdata = scontrol->control_data;

	struct sof_ipc_ctrl_data *cdata = scontrol->ipc_control_data;

	struct snd_ctl_tlv header;

	struct snd_ctl_tlv __user *tlvd = (struct snd_ctl_tlv __user *)binary_data;

	size_t data_size;
@@ -482,7 +482,7 @@ int snd_sof_bytes_ext_get(struct snd_kcontrol *kcontrol, 
		(struct soc_bytes_ext *)kcontrol->private_value;

	struct snd_sof_control *scontrol = be->dobj.private;

	struct snd_soc_component *scomp = scontrol->scomp;

	struct sof_ipc_ctrl_data *cdata = scontrol->control_data;

	struct sof_ipc_ctrl_data *cdata = scontrol->ipc_control_data;

	struct snd_ctl_tlv header;

	struct snd_ctl_tlv __user *tlvd =

		(struct snd_ctl_tlv __user *)binary_data;
@@ -534,7 +534,7 @@ static void snd_sof_update_control(struct snd_sof_control *scontrol, 
	struct sof_ipc_ctrl_data *local_cdata;

	int i;



	local_cdata = scontrol->control_data;

	local_cdata = scontrol->ipc_control_data;



	if (cdata->cmd == SOF_CTRL_CMD_BINARY) {

		if (cdata->num_elems != local_cdata->data->size) {

sound/soc/sof/core.c

+1 −0
Original line number Diff line number Diff line
@@ -370,6 +370,7 @@ int snd_sof_device_probe(struct device *dev, struct snd_sof_pdata *plat_data) 
	INIT_LIST_HEAD(&sdev->kcontrol_list);

	INIT_LIST_HEAD(&sdev->widget_list);

	INIT_LIST_HEAD(&sdev->dai_list);

	INIT_LIST_HEAD(&sdev->dai_link_list);

	INIT_LIST_HEAD(&sdev->route_list);

	INIT_LIST_HEAD(&sdev->ipc_client_list);

	INIT_LIST_HEAD(&sdev->ipc_rx_handler_list);

sound/soc/sof/ipc.c

+13 −1
Original line number Diff line number Diff line
@@ -812,7 +812,7 @@ static int sof_set_get_large_ctrl_data(struct snd_sof_dev *sdev, 
int snd_sof_ipc_set_get_comp_data(struct snd_sof_control *scontrol, bool set)

{

	struct snd_soc_component *scomp = scontrol->scomp;

	struct sof_ipc_ctrl_data *cdata = scontrol->control_data;

	struct sof_ipc_ctrl_data *cdata = scontrol->ipc_control_data;

	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);

	struct sof_ipc_fw_ready *ready = &sdev->fw_ready;

	struct sof_ipc_fw_version *v = &ready->version;
@@ -1023,6 +1023,18 @@ struct snd_sof_ipc *snd_sof_ipc_init(struct snd_sof_dev *sdev) 


	init_waitqueue_head(&msg->waitq);



	/*

	 * Use IPC3 ops as it is the only available version now. With the addition of new IPC

	 * versions, this will need to be modified to use the selected version at runtime.

	 */

	ipc->ops = &ipc3_ops;



	/* check for mandatory ops */

	if (!ipc->ops->tplg || !ipc->ops->tplg->widget) {

		dev_err(sdev->dev, "Invalid topology IPC ops\n");

		return NULL;

	}



	return ipc;

}

EXPORT_SYMBOL(snd_sof_ipc_init);

sound/soc/sof/ipc3-topology.c

0 → 100644
+2019 −0

File added.

Preview size limit exceeded, changes collapsed.