ASoC: SOF: make struct snd_sof_widget IPC agnostic

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>
Link: https://lore.kernel.org/r/20220308164344.577647-12-ranjani.sridharan@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/sof/topology.h b/include/sound/sof/topology.h
index adee6afd149044a42d7c8f097ad4a822b5b53779..88560281d420603598f7b02a48ce168875b5acd8 100644 (file)
--- a/include/sound/sof/topology.h
+++ b/include/sound/sof/topology.h
@@ -87,9 +87,6 @@ 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;
@@ -303,9 +300,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 a8eeffc12b24d1d4e71a685c8bcf41bd1277895d..10330d826d406400a9d185b0e649a82b82011f25 100644 (file)
--- 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;
+       const guid_t uuid;
 
        void *private;          /* core does not touch this */
 };

diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c
index 41927e99ace27b4416a39817f1aadbb56c427f2c..111ff0f77be4d38baf66eea8cae7a69cc66f8c69 100644 (file)
--- 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,16 @@ 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 (!guid_is_null(&swidget->uuid))
+               total_size += ext_size;
 
        comp = kzalloc(total_size, GFP_KERNEL);
        if (!comp)
@@ -1444,8 +1444,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 +2276,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);