| Message ID | 20220307181111.49392-12-ranjani.sridharan@linux.intel.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Clean ups and preparation for IPC abstraction in the SOF driver | expand |
On 3/7/2022 7:11 PM, Ranjani Sridharan wrote: > Parse the UUID token and save it in the new uuid field in struct > snd_sof_widget. struct sof_ipc_comp_ext is no longer needed. So remove > it too. > > Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> > Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> > Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com> > Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > --- > include/sound/sof/topology.h | 5 ----- > sound/soc/sof/sof-audio.h | 3 +-- > sound/soc/sof/topology.c | 20 ++++++++++---------- > 3 files changed, 11 insertions(+), 17 deletions(-) > > diff --git a/include/sound/sof/topology.h b/include/sound/sof/topology.h > index adee6afd1490..33bd9eaffd50 100644 > --- a/include/sound/sof/topology.h > +++ b/include/sound/sof/topology.h > @@ -303,9 +303,4 @@ 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 > diff --git a/sound/soc/sof/sof-audio.h b/sound/soc/sof/sof-audio.h > index a8eeffc12b24..5c10df500ffb 100644 > --- a/sound/soc/sof/sof-audio.h > +++ b/sound/soc/sof/sof-audio.h > @@ -110,8 +110,7 @@ struct snd_sof_widget { > struct list_head list; /* list in sdev widget list */ > struct snd_sof_widget *pipe_widget; > > - /* extended data for UUID components */ > - struct sof_ipc_comp_ext comp_ext; > + u8 uuid[SOF_UUID_SIZE]; Can this be uuid_t perhaps? > > void *private; /* core does not touch this */ > }; > diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c > index 41927e99ace2..45bac1ac9fdd 100644 > --- a/sound/soc/sof/topology.c > +++ b/sound/soc/sof/topology.c > @@ -743,7 +743,7 @@ static const struct sof_topology_token core_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)}, > + offsetof(struct snd_sof_widget, uuid)}, > }; > > /* > @@ -1419,16 +1419,17 @@ static int sof_connect_dai_widget(struct snd_soc_component *scomp, > * > * 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) > +static struct sof_ipc_comp *sof_comp_alloc(struct snd_sof_widget *swidget, size_t *ipc_size, > + int index) > { > u8 nil_uuid[SOF_UUID_SIZE] = {0}; > struct sof_ipc_comp *comp; > size_t total_size = *ipc_size; > + size_t ext_size = sizeof(swidget->uuid); > > /* only non-zero UUID is valid */ > - if (memcmp(&swidget->comp_ext, nil_uuid, SOF_UUID_SIZE)) > - total_size += sizeof(swidget->comp_ext); > + if (memcmp(swidget->uuid, nil_uuid, SOF_UUID_SIZE)) > + total_size += ext_size; And if you change type above then uuid_is_null(swidget->uuid) here? > > comp = kzalloc(total_size, GFP_KERNEL); > if (!comp) > @@ -1444,8 +1445,8 @@ static struct sof_ipc_comp *sof_comp_alloc(struct snd_sof_widget *swidget, > /* 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); > + memcpy((u8 *)comp + *ipc_size, swidget->uuid, ext_size); and uuid_copy() here? > + comp->ext_data_length = ext_size; > } > > /* update ipc_size and return */ > @@ -2276,9 +2277,8 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index, > > swidget->core = comp.core; > > - 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)); > + ret = sof_parse_tokens(scomp, swidget, 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);
diff --git a/include/sound/sof/topology.h b/include/sound/sof/topology.h index adee6afd1490..33bd9eaffd50 100644 --- a/include/sound/sof/topology.h +++ b/include/sound/sof/topology.h @@ -303,9 +303,4 @@ 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 diff --git a/sound/soc/sof/sof-audio.h b/sound/soc/sof/sof-audio.h index a8eeffc12b24..5c10df500ffb 100644 --- a/sound/soc/sof/sof-audio.h +++ b/sound/soc/sof/sof-audio.h @@ -110,8 +110,7 @@ struct snd_sof_widget { struct list_head list; /* list in sdev widget list */ struct snd_sof_widget *pipe_widget; - /* extended data for UUID components */ - struct sof_ipc_comp_ext comp_ext; + u8 uuid[SOF_UUID_SIZE]; void *private; /* core does not touch this */ }; diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index 41927e99ace2..45bac1ac9fdd 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -743,7 +743,7 @@ static const struct sof_topology_token core_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)}, + offsetof(struct snd_sof_widget, uuid)}, }; /* @@ -1419,16 +1419,17 @@ static int sof_connect_dai_widget(struct snd_soc_component *scomp, * * 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) +static struct sof_ipc_comp *sof_comp_alloc(struct snd_sof_widget *swidget, size_t *ipc_size, + int index) { u8 nil_uuid[SOF_UUID_SIZE] = {0}; struct sof_ipc_comp *comp; size_t total_size = *ipc_size; + size_t ext_size = sizeof(swidget->uuid); /* only non-zero UUID is valid */ - if (memcmp(&swidget->comp_ext, nil_uuid, SOF_UUID_SIZE)) - total_size += sizeof(swidget->comp_ext); + if (memcmp(swidget->uuid, nil_uuid, SOF_UUID_SIZE)) + total_size += ext_size; comp = kzalloc(total_size, GFP_KERNEL); if (!comp) @@ -1444,8 +1445,8 @@ static struct sof_ipc_comp *sof_comp_alloc(struct snd_sof_widget *swidget, /* 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); + memcpy((u8 *)comp + *ipc_size, swidget->uuid, ext_size); + comp->ext_data_length = ext_size; } /* update ipc_size and return */ @@ -2276,9 +2277,8 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index, swidget->core = comp.core; - 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)); + ret = sof_parse_tokens(scomp, swidget, 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);