ASoC: SOF: component UUID support for 5.10
Subsystems (3)
Kai Vehmanen
reviewercover ASoC: SOF: component UUID support for 5.10
This series adds support for UUID based component identification in SOF. UUIDs provide a more scalable alternative to the old component type based approach to identify which DSP components should be loaded.
More detailed description of UUID usage in SOF is available in:
https://thesofproject.github.io/latest/developer_guides/uuid/
UUID support is an incremental update to the SOF IPC interface. Driver remains compatible with pre-UUID (ABI <3.17) firmware versions.
Keyon Jie (16):
ASoC: SOF: tokens: add token for component UUID
ASoC: SOF: add comp_ext to struct snd_sof_widget
ASoC: SOF: topology: create component extended tokens
ASoC: SOF: topology: parse comp_ext_tokens for all widgets
ASoC: SOF: use the sof_ipc_comp reserved bytes for extended data
ASoC: SOF: topology: add helper for setting up IPC component
ASoC: SOF: append extended data to sof_ipc_comp_dai
ASoC: SOF: append extended data to sof_ipc_comp_mixer
ASoC: SOF: append extended data to sof_ipc_comp_volume
ASoC: SOF: append extended data to sof_ipc_comp_host
ASoC: SOF: append extended data to sof_ipc_comp_src
ASoC: SOF: append extended data to sof_ipc_comp_asrc
ASoC: SOF: append extended data to sof_ipc_comp_tone
ASoC: SOF: append extended data to sof_ipc_comp_process
ASoC: SOF: append extended data to sof_ipc_comp_mux
ASoC: SOF: topology: make process type optional
include/sound/sof/topology.h | 12 +- include/uapi/sound/sof/tokens.h | 1 + sound/soc/sof/sof-audio.c | 23 +++- sound/soc/sof/sof-audio.h | 3 + sound/soc/sof/topology.c | 208 ++++++++++++++++++++------------ 5 files changed, 161 insertions(+), 86 deletions(-)
Signature · 1 line
2.27.0
Kai Vehmanen
reviewerPATCH 1/16 ASoC: SOF: tokens: add token for component UUID
From: Keyon Jie <[email protected]>
Add the definition SOF_TKN_COMP_UUID for the component UUID token, this shall be used for all types of component in the future.
--- include/uapi/sound/sof/tokens.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/sound/sof/tokens.h +1 -0
@@ -74,6 +74,7 @@* #define SOF_TKN_COMP_PRELOAD_COUNT 403 */ #define SOF_TKN_COMP_CORE_ID 404 +#define SOF_TKN_COMP_UUID 405/* SSP */ #define SOF_TKN_INTEL_SSP_CLKS_CONTROL 500
Signature · 1 line
2.27.0
Kai Vehmanen
reviewerPATCH 2/16 ASoC: SOF: add comp_ext to struct snd_sof_widget
In reply to Kai VehmanenFrom: Keyon Jie <[email protected]>
Add member comp_ext to struct snd_sof_widget, which will be used for topology extended tokens parsing.
--- include/sound/sof/topology.h | 8 ++++++++ sound/soc/sof/sof-audio.h | 3 +++ 2 files changed, 11 insertions(+)
include/sound/sof/topology.h +8 -0
@@ -87,6 +87,9 @@ struct sof_ipc_comp {*/ #define SOF_BUF_UNDERRUN_PERMITTED BIT(1) +/* the UUID size in bytes, shared between FW and host */ +#define SOF_UUID_SIZE 16 +/* create new component buffer - SOF_IPC_TPLG_BUFFER_NEW */ struct sof_ipc_buffer {struct sof_ipc_comp comp;
@@ -300,4 +303,9 @@ enum sof_event_types { SOF_KEYWORD_DETECT_DAPM_EVENT, }; +/* extended data struct for UUID components */ +struct sof_ipc_comp_ext { +uint8_t uuid[SOF_UUID_SIZE ]; +} __packed; +#endif
sound/soc/sof/sof-audio.h +3 -0
@@ -89,6 +89,9 @@ struct snd_sof_widget {struct snd_soc_dapm_widget *widget;struct list_head list;/* list in sdev widget list */ +/* extended data for UUID components */ +struct sof_ipc_comp_ext comp_ext; +void *private;/* core does not touch this */ };
Signature · 1 line
2.27.0
Kai Vehmanen
reviewerPATCH 3/16 ASoC: SOF: topology: create component extended tokens
In reply to Kai VehmanenFrom: Keyon Jie <[email protected]>
Add comp_ext_tokens which will be used to parse all extended tokens, these tokens will be stored it to struct snd_sof_widget.
--- sound/soc/sof/topology.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
sound/soc/sof/topology.c +17 -0
@@ -492,6 +492,16 @@ static int get_token_u16(void *elem, void *object, u32 offset, u32 size)return 0 ; } +static int get_token_uuid (void *elem,void *object,u32 offset,u32 size) +{ +struct snd_soc_tplg_vendor_uuid_elem *velem = elem; +u8 *dst = (u8 *)object + offset; + +memcpy (dst, velem->uuid,UUID_SIZE ); + +return 0 ; +} +static int get_token_comp_format (void *elem,void *object,u32 offset,u32 size) {struct snd_soc_tplg_vendor_string_elem *velem = elem;
@@ -725,6 +735,13 @@ static const struct sof_topology_token core_tokens[] = { offsetof(struct sof_ipc_comp, core), 0}, }; +/* Component extended tokens */ +static const struct sof_topology_token comp_ext_tokens[] = { + {SOF_TKN_COMP_UUID , +SND_SOC_TPLG_TUPLE_TYPE_UUID , get_token_uuid, + offsetof(struct sof_ipc_comp_ext , uuid),0 }, +}; +/* * DMIC PDM Tokens * SOF_TKN_INTEL_DMIC_PDM_CTRL_ID should be the first token
Signature · 1 line
2.27.0
Kai Vehmanen
reviewerPATCH 4/16 ASoC: SOF: topology: parse comp_ext_tokens for all widgets
In reply to Kai VehmanenFrom: Keyon Jie <[email protected]>
Parse comp_ext_tokens in the common sof_widget_ready(), and the swidget->comp_ext will be used to construct the COMP_NEW ipc in the subsequent commits.
--- sound/soc/sof/topology.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
sound/soc/sof/topology.c +10 -0
@@ -2401,6 +2401,16 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index,return ret; } + ret =sof_parse_tokens (scomp, &swidget->comp_ext, comp_ext_tokens, +ARRAY_SIZE (comp_ext_tokens), tw->priv.array, +le32_to_cpu (tw->priv.size)); +if (ret !=0 ) { +dev_err (scomp->dev,"error: parsing comp_ext_tokens failed %d\n" , + ret); +kfree (swidget); +return ret; + } +/* handle any special case widgets */ switch (w->id) {case snd_soc_dapm_dai_in:
Signature · 1 line
2.27.0
Kai Vehmanen
reviewerPATCH 5/16 ASoC: SOF: use the sof_ipc_comp reserved bytes for extended data
In reply to Kai VehmanenFrom: Keyon Jie <[email protected]>
Use the 32bit reserved member of the struct sof_ipc_comp as the extended data length, this will help to minimize the ABI change for adding new extended data to the struct sof_ipc_comp, usually only minor ABI version bump needed for every update with this new solution.
--- include/sound/sof/topology.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/sound/sof/topology.h +2 -2
@@ -57,8 +57,8 @@ struct sof_ipc_comp {uint32_t pipeline_id;uint32_t core; -/* reserved for future use */ -uint32_t reserved[1 ]; +/* extended data length, 0 if no extended data */ +uint32_t ext_data_length; } __packed;/*
Signature · 1 line
2.27.0
Kai Vehmanen
reviewerPATCH 6/16 ASoC: SOF: topology: add helper for setting up IPC component
In reply to Kai VehmanenFrom: Keyon Jie <[email protected]>
Add helper to allocate buffer for IPC component, configure the basic settings, and set up the extended data for the subsequent IPC sending.
--- sound/soc/sof/topology.c | 45 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+)
sound/soc/sof/topology.c +45 -0
@@ -1453,6 +1453,51 @@ static int sof_connect_dai_widget(struct snd_soc_component *scomp,return 0 ; } +/** +* sof_comp_alloc - allocate and initialize buffer for a new component +* @swidget: pointer to struct snd_sof_widget containing extended data +* @ipc_size: IPC payload size that will be updated depending on valid +* extended data. +* @index: ID of the pipeline the component belongs to +* @core: index of the DSP core that the component should run on +* +* Return: The pointer to the new allocated component, NULL if failed. +*/ +static struct sof_ipc_comp *sof_comp_alloc (struct snd_sof_widget *swidget, +size_t *ipc_size,int index, +int core) +{ +u8 nil_uuid[SOF_UUID_SIZE ] = {0 }; +struct sof_ipc_comp *comp; +size_t total_size = *ipc_size; + +/* only non-zero UUID is valid */ +if (memcmp (&swidget->comp_ext, nil_uuid,SOF_UUID_SIZE )) + total_size +=sizeof (swidget->comp_ext); + + comp =kzalloc (total_size,GFP_KERNEL ); +if (!comp) +return NULL ; + +/* configure comp new IPC message */ + comp->hdr.size = total_size; + comp->hdr.cmd =SOF_IPC_GLB_TPLG_MSG |SOF_IPC_TPLG_COMP_NEW ; + comp->id = swidget->comp_id; + comp->pipeline_id = index; + comp->core = core; + +/* handle the extended data if needed */ +if (total_size > *ipc_size) { +/* append extended data to the end of the component */ +memcpy ((u8 *)comp + *ipc_size, &swidget->comp_ext,sizeof (swidget->comp_ext)); + comp->ext_data_length =sizeof (swidget->comp_ext); + } + +/* update ipc_size and return */ + *ipc_size = total_size; +return comp; +} + static int sof_widget_load_dai(struct snd_soc_component *scomp, int index, struct snd_sof_widget *swidget, int core, struct snd_soc_tplg_dapm_widget *tw,
Signature · 1 line
2.27.0
Kai Vehmanen
reviewerPATCH 7/16 ASoC: SOF: append extended data to sof_ipc_comp_dai
In reply to Kai VehmanenFrom: Keyon Jie <[email protected]>
Append the extended data to the end of the struct sof_ipc_comp_dai, and update the ext_data_offset, to construct the IPC for the topology load and runtime restore.
--- sound/soc/sof/sof-audio.c | 23 +++++++++++++++----- sound/soc/sof/topology.c | 46 +++++++++++++++++++++++---------------- 2 files changed, 45 insertions(+), 24 deletions(-)
sound/soc/sof/sof-audio.c +18 -5
@@ -165,8 +165,9 @@ int sof_restore_pipelines(struct device *dev)struct snd_sof_route *sroute;struct sof_ipc_pipe_new *pipeline;struct snd_sof_dai *dai; -struct sof_ipc_comp_dai *comp_dai;struct sof_ipc_cmd_hdr *hdr; +struct sof_ipc_comp *comp; +size_t ipc_size;int ret;/* restore pipeline components */
@@ -189,12 +190,24 @@ int sof_restore_pipelines(struct device *dev)switch (swidget->id) {case snd_soc_dapm_dai_in:case snd_soc_dapm_dai_out: + ipc_size =sizeof (struct sof_ipc_comp_dai ) + +sizeof (struct sof_ipc_comp_ext ); + comp =kzalloc (ipc_size,GFP_KERNEL ); +if (!comp) +return -ENOMEM ; + dai = swidget->private; - comp_dai = &dai->comp_dai; - ret =sof_ipc_tx_message (sdev->ipc, - comp_dai->comp.hdr.cmd, - comp_dai,sizeof (*comp_dai), +memcpy (comp, &dai->comp_dai, +sizeof (struct sof_ipc_comp_dai )); + +/* append extended data to the end of the component */ +memcpy ((u8 *)comp +sizeof (struct sof_ipc_comp_dai ), + &swidget->comp_ext,sizeof (swidget->comp_ext)); + + ret =sof_ipc_tx_message (sdev->ipc, comp->hdr.cmd, + comp, ipc_size, &r,sizeof (r)); +kfree (comp);break ;case snd_soc_dapm_scheduler:
sound/soc/sof/topology.c +27 -19
76 lines not on this page · raw message
Signature · 1 line
2.27.0
Kai Vehmanen
reviewerPATCH 8/16 ASoC: SOF: append extended data to sof_ipc_comp_mixer
In reply to Kai VehmanenFrom: Keyon Jie <[email protected]>
Append the extended data to the end of the struct sof_ipc_comp_mixer, construct the ipc for COMP_NEW during the topology load stage.
--- sound/soc/sof/topology.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
sound/soc/sof/topology.c +4 -7
@@ -1783,19 +1783,16 @@ static int sof_widget_load_mixer(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_mixer *mixer; +size_t ipc_size =sizeof (*mixer);int ret; - mixer =kzalloc (sizeof (*mixer),GFP_KERNEL ); + mixer = (struct sof_ipc_comp_mixer *) +sof_comp_alloc (swidget, &ipc_size, index, core);if (!mixer)return -ENOMEM ;/* configure mixer IPC message */ - mixer->comp.hdr.size =sizeof (*mixer); - mixer->comp.hdr.cmd =SOF_IPC_GLB_TPLG_MSG |SOF_IPC_TPLG_COMP_NEW ; - mixer->comp.id = swidget->comp_id; mixer->comp.type =SOF_COMP_MIXER ; - mixer->comp.pipeline_id = index; - mixer->comp.core = core; mixer->config.hdr.size =sizeof (mixer->config); ret = sof_parse_tokens(scomp, &mixer->config, comp_tokens,
@@ -1813,7 +1810,7 @@ static int sof_widget_load_mixer(struct snd_soc_component *scomp, int index, swidget->private = mixer; ret =sof_ipc_tx_message (sdev->ipc, mixer->comp.hdr.cmd, mixer, -sizeof (*mixer), r,sizeof (*r)); + ipc_size, r,sizeof (*r));if (ret <0 )kfree (mixer);
Signature · 1 line
2.27.0
Kai Vehmanen
reviewerPATCH 9/16 ASoC: SOF: append extended data to sof_ipc_comp_volume
In reply to Kai VehmanenFrom: Keyon Jie <[email protected]>
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.
--- sound/soc/sof/topology.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
sound/soc/sof/topology.c +4 -7
@@ -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:
Signature · 1 line
2.27.0
Kai Vehmanen
reviewerPATCH 10/16 ASoC: SOF: append extended data to sof_ipc_comp_host
In reply to Kai VehmanenFrom: Keyon Jie <[email protected]>
Append the extended data to the end of the struct sof_ipc_comp_host, construct the ipc for COMP_NEW during the topology load stage.
--- sound/soc/sof/topology.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
sound/soc/sof/topology.c +4 -7
@@ -1644,19 +1644,16 @@ static int sof_widget_load_pcm(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_host *host; +size_t ipc_size =sizeof (*host);int ret; - host =kzalloc (sizeof (*host),GFP_KERNEL ); + host = (struct sof_ipc_comp_host *) +sof_comp_alloc (swidget, &ipc_size, index, core);if (!host)return -ENOMEM ;/* configure host comp IPC message */ - host->comp.hdr.size =sizeof (*host); - host->comp.hdr.cmd =SOF_IPC_GLB_TPLG_MSG |SOF_IPC_TPLG_COMP_NEW ; - host->comp.id = swidget->comp_id; host->comp.type =SOF_COMP_HOST ; - host->comp.pipeline_id = index; - host->comp.core = core; host->direction = dir; host->config.hdr.size =sizeof (host->config);
@@ -1684,7 +1681,7 @@ static int sof_widget_load_pcm(struct snd_soc_component *scomp, int index, swidget->private = host; ret =sof_ipc_tx_message (sdev->ipc, host->comp.hdr.cmd, host, -sizeof (*host), r,sizeof (*r)); + ipc_size, r,sizeof (*r));if (ret >=0 )return ret; err:
Signature · 1 line
2.27.0
Kai Vehmanen
reviewerPATCH 11/16 ASoC: SOF: append extended data to sof_ipc_comp_src
In reply to Kai VehmanenFrom: Keyon Jie <[email protected]>
Append the extended data to the end of the struct sof_ipc_comp_src, construct the ipc for COMP_NEW during the topology load stage.
--- sound/soc/sof/topology.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
sound/soc/sof/topology.c +4 -7
@@ -1950,19 +1950,16 @@ static int sof_widget_load_src(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_src *src; +size_t ipc_size =sizeof (*src);int ret; - src =kzalloc (sizeof (*src),GFP_KERNEL ); + src = (struct sof_ipc_comp_src *) +sof_comp_alloc (swidget, &ipc_size, index, core);if (!src)return -ENOMEM ;/* configure src IPC message */ - src->comp.hdr.size =sizeof (*src); - src->comp.hdr.cmd =SOF_IPC_GLB_TPLG_MSG |SOF_IPC_TPLG_COMP_NEW ; - src->comp.id = swidget->comp_id; src->comp.type =SOF_COMP_SRC ; - src->comp.pipeline_id = index; - src->comp.core = core; src->config.hdr.size =sizeof (src->config); ret = sof_parse_tokens(scomp, src, src_tokens,
@@ -1990,7 +1987,7 @@ static int sof_widget_load_src(struct snd_soc_component *scomp, int index, swidget->private = src; ret =sof_ipc_tx_message (sdev->ipc, src->comp.hdr.cmd, src, -sizeof (*src), r,sizeof (*r)); + ipc_size, r,sizeof (*r));if (ret >=0 )return ret; err:
Signature · 1 line
2.27.0
Kai Vehmanen
reviewerPATCH 12/16 ASoC: SOF: append extended data to sof_ipc_comp_asrc
In reply to Kai VehmanenFrom: Keyon Jie <[email protected]>
Append the extended data to the end of the struct sof_ipc_comp_asrc, construct the ipc for COMP_NEW during the topology load stage.
--- sound/soc/sof/topology.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
sound/soc/sof/topology.c +4 -7
@@ -2007,19 +2007,16 @@ static int sof_widget_load_asrc(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_asrc *asrc; +size_t ipc_size =sizeof (*asrc);int ret; - asrc =kzalloc (sizeof (*asrc),GFP_KERNEL ); + asrc = (struct sof_ipc_comp_asrc *) +sof_comp_alloc (swidget, &ipc_size, index, core);if (!asrc)return -ENOMEM ;/* configure ASRC IPC message */ - asrc->comp.hdr.size =sizeof (*asrc); - asrc->comp.hdr.cmd =SOF_IPC_GLB_TPLG_MSG |SOF_IPC_TPLG_COMP_NEW ; - asrc->comp.id = swidget->comp_id; asrc->comp.type =SOF_COMP_ASRC ; - asrc->comp.pipeline_id = index; - asrc->comp.core = core; asrc->config.hdr.size =sizeof (asrc->config); ret = sof_parse_tokens(scomp, asrc, asrc_tokens,
@@ -2049,7 +2046,7 @@ static int sof_widget_load_asrc(struct snd_soc_component *scomp, int index, swidget->private = asrc; ret =sof_ipc_tx_message (sdev->ipc, asrc->comp.hdr.cmd, asrc, -sizeof (*asrc), r,sizeof (*r)); + ipc_size, r,sizeof (*r));if (ret >=0 )return ret; err:
Signature · 1 line
2.27.0
Kai Vehmanen
reviewerPATCH 13/16 ASoC: SOF: append extended data to sof_ipc_comp_tone
In reply to Kai VehmanenFrom: Keyon Jie <[email protected]>
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.
--- sound/soc/sof/topology.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
sound/soc/sof/topology.c +4 -7
@@ -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:
Signature · 1 line
2.27.0
Kai Vehmanen
reviewerPATCH 14/16 ASoC: SOF: append extended data to sof_ipc_comp_process
In reply to Kai VehmanenFrom: Keyon Jie <[email protected]>
Append the extended data to the end of the struct sof_ipc_comp_process, construct the ipc for COMP_NEW during the topology load stage.
--- sound/soc/sof/topology.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
sound/soc/sof/topology.c +2 -5
@@ -2231,18 +2231,15 @@ static int sof_process_load(struct snd_soc_component *scomp, int index, ipc_data_size =0 ; } - process =kzalloc (ipc_size,GFP_KERNEL ); + process = (struct sof_ipc_comp_process *) +sof_comp_alloc (swidget, &ipc_size, index,0 );if (!process) { ret = -ENOMEM ; goto out; }/* configure iir IPC message */ - process->comp.hdr.size = ipc_size; - process->comp.hdr.cmd =SOF_IPC_GLB_TPLG_MSG |SOF_IPC_TPLG_COMP_NEW ; - process->comp.id = swidget->comp_id; process->comp.type = type; - process->comp.pipeline_id = index; process->config.hdr.size =sizeof (process->config); ret = sof_parse_tokens(scomp, &process->config, comp_tokens,
Signature · 1 line
2.27.0
Kai Vehmanen
reviewerPATCH 15/16 ASoC: SOF: append extended data to sof_ipc_comp_mux
In reply to Kai VehmanenFrom: Keyon Jie <[email protected]>
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.
--- sound/soc/sof/topology.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
sound/soc/sof/topology.c +4 -7
@@ -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);
Signature · 1 line
2.27.0
Kai Vehmanen
reviewerPATCH 16/16 ASoC: SOF: topology: make process type optional
In reply to Kai VehmanenFrom: Keyon Jie <[email protected]>
As components can be now identified with a UUID based mechanism, the process type is no longer required. For new DSP components, process and its component type can be set to SOF_PROCESS_NONE and SOF_COMP_NONE. Allow this combination in topology load, modify the load time check for process type to reflect this.
--- sound/soc/sof/topology.c | 6 ------ 1 file changed, 6 deletions(-)
sound/soc/sof/topology.c +0 -6
@@ -2197,12 +2197,6 @@ static int sof_process_load(struct snd_soc_component *scomp, int index,int ret;int i; -if (type ==SOF_COMP_NONE ) { -dev_err (scomp->dev,"error: invalid process comp type %d\n" , - type); -return -EINVAL ; - } -/* allocate struct for widget control data sizes and types */ if (widget->num_kcontrols) { wdata = kcalloc(widget->num_kcontrols,
Signature · 1 line
2.27.0
Mark Brown
maintainerQuoted 9 lines · Kai Vehmanen
This series adds support for UUID based component identification in SOF. UUIDs provide a more scalable alternative to the old component type based approach to identify which DSP components should be loaded.
More detailed description of UUID usage in SOF is available in:
https://thesofproject.github.io/latest/developer_guides/uuid/[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[01/16] ASoC: SOF: tokens: add token for component UUID
commit: 43fbb0860c682859780907d00bdb4abbb1b6359e
[02/16] ASoC: SOF: add comp_ext to struct snd_sof_widget
commit: f970a77f1d064eeddc32a9ed0fd7db3a66d82fdd
[03/16] ASoC: SOF: topology: create component extended tokens
commit: 92f500cfc329ee3082f20b2f1364788b759ab588
[04/16] ASoC: SOF: topology: parse comp_ext_tokens for all widgets
commit: 929e427a9c4e59d744fb5d3771b87a741ea3078a
[05/16] ASoC: SOF: use the sof_ipc_comp reserved bytes for extended data
commit: 50b55fd463ce565b768d8bc214dd0280bee8b10d
[06/16] ASoC: SOF: topology: add helper for setting up IPC component
commit: a905bb0193e7d637bc6b6c86e87f7f9976363d07
[07/16] ASoC: SOF: append extended data to sof_ipc_comp_dai
commit: f8ee6c9f5258ce0f7e342d7ecc63d81e45a607fe
[08/16] ASoC: SOF: append extended data to sof_ipc_comp_mixer
commit: f375bb336df3152360fbcdc4b7c49998d43abd0c
[09/16] ASoC: SOF: append extended data to sof_ipc_comp_volume
commit: 9fed9d91c00e60cab61844efdb521f4ea5255da0
[10/16] ASoC: SOF: append extended data to sof_ipc_comp_host
commit: bbc1364cdd323e6188371744f91d55152e79c14f
[11/16] ASoC: SOF: append extended data to sof_ipc_comp_src
commit: b64ce2c62ca3d751dc9407e61eef1ba66f6e18c8
[12/16] ASoC: SOF: append extended data to sof_ipc_comp_asrc
commit: c7ded588468ada986f1f96645f7e84781e46fc87
[13/16] ASoC: SOF: append extended data to sof_ipc_comp_tone
commit: 3584ba4c78f719a081ba140db0662aacdd00190f
[14/16] ASoC: SOF: append extended data to sof_ipc_comp_process
commit: 783898ce68de5261faa4697622f38df8b08251a7
[15/16] ASoC: SOF: append extended data to sof_ipc_comp_mux
commit: d2306f4ed181e3bfe91a96a360f9674613c036a6
[16/16] ASoC: SOF: topology: make process type optional
commit: 988d941882336b860d5fae1ee6f487eb110fe6d6All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark