ASoC: SOF: change comp_dai to a pointer in struct snd_sof_dai

This will avoid having to add the extended data for DAI components during
sof_widget_setup() as an extra step.

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/20220307181111.49392-11-ranjani.sridharan@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/pcm.c b/sound/soc/sof/pcm.c
index a312ed855f1abe0c93c66eaedc7a87c40917f36f..1d04f75e6d32ac80a03fcc2d9d20a88f910ada82 100644 (file)
--- a/sound/soc/sof/pcm.c
+++ b/sound/soc/sof/pcm.c
@@ -717,7 +717,7 @@ int sof_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_pa
        /* read format from topology */
        snd_mask_none(fmt);
 
-       switch (dai->comp_dai.config.frame_fmt) {
+       switch (dai->comp_dai->config.frame_fmt) {
        case SOF_IPC_FRAME_S16_LE:
                snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S16_LE);
                break;
@@ -752,10 +752,10 @@ int sof_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_pa
                break;
        case SOF_DAI_INTEL_DMIC:
                /* DMIC only supports 16 or 32 bit formats */
-               if (dai->comp_dai.config.frame_fmt == SOF_IPC_FRAME_S24_4LE) {
+               if (dai->comp_dai->config.frame_fmt == SOF_IPC_FRAME_S24_4LE) {
                        dev_err(component->dev,
                                "error: invalid fmt %d for DAI type %d\n",
-                               dai->comp_dai.config.frame_fmt,
+                               dai->comp_dai->config.frame_fmt,
                                dai->dai_config->type);
                }
                break;

diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c
index e39f18e824b440c2ba402ee96ea675dde639266a..b49d8e3480774ab940c328a83c819a42ed0be94f 100644 (file)
--- a/sound/soc/sof/sof-audio.c
+++ b/sound/soc/sof/sof-audio.c
@@ -170,7 +170,6 @@ int sof_widget_setup(struct snd_sof_dev *sdev, struct snd_sof_widget *swidget)
        struct sof_ipc_cmd_hdr *hdr;
        struct sof_ipc_comp *comp;
        struct snd_sof_dai *dai;
-       size_t ipc_size;
        int ret;
 
        /* skip if there is no private data */
@@ -192,23 +191,12 @@ int sof_widget_setup(struct snd_sof_dev *sdev, struct snd_sof_widget *swidget)
        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) {
-                       ret = -ENOMEM;
-                       goto core_put;
-               }
-
                dai = swidget->private;
+               comp = &dai->comp_dai->comp;
                dai->configured = false;
-               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);
+               ret = sof_ipc_tx_message(sdev->ipc, comp->hdr.cmd, dai->comp_dai, comp->hdr.size,
+                                        &r, sizeof(r));
                if (ret < 0) {
                        dev_err(sdev->dev, "error: failed to load widget %s\n",
                                swidget->widget->name);

diff --git a/sound/soc/sof/sof-audio.h b/sound/soc/sof/sof-audio.h
index feda5793b5895df51689ca0a7c5032dd0e26624a..a8eeffc12b24d1d4e71a685c8bcf41bd1277895d 100644 (file)
--- a/sound/soc/sof/sof-audio.h
+++ b/sound/soc/sof/sof-audio.h
@@ -134,7 +134,7 @@ struct snd_sof_dai {
        struct snd_soc_component *scomp;
        const char *name;
 
-       struct sof_ipc_comp_dai comp_dai;
+       struct sof_ipc_comp_dai *comp_dai;
        int number_configs;
        int current_config;
        bool configured; /* DAI configured during BE hw_params */

diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c
index dd1cc6e2668606d2e70b8efa627a721d7405bb6e..41927e99ace27b4416a39817f1aadbb56c427f2c 100644 (file)
--- a/sound/soc/sof/topology.c
+++ b/sound/soc/sof/topology.c
@@ -1478,7 +1478,7 @@ static int sof_widget_load_dai(struct snd_soc_component *scomp, int index,
        if (ret != 0) {
                dev_err(scomp->dev, "error: parse dai tokens failed %d\n",
                        le32_to_cpu(private->size));
-               goto finish;
+               return ret;
        }
 
        ret = sof_parse_tokens(scomp, &comp_dai->config, comp_tokens,
@@ -1487,7 +1487,7 @@ static int sof_widget_load_dai(struct snd_soc_component *scomp, int index,
        if (ret != 0) {
                dev_err(scomp->dev, "error: parse dai.cfg tokens failed %d\n",
                        private->size);
-               goto finish;
+               return ret;
        }
 
        dev_dbg(scomp->dev, "dai %s: type %d index %d\n",
@@ -1496,17 +1496,9 @@ static int sof_widget_load_dai(struct snd_soc_component *scomp, int index,
 
        if (dai) {
                dai->scomp = scomp;
-
-               /*
-                * copy only the sof_ipc_comp_dai to avoid collapsing
-                * the snd_sof_dai, the extended data is kept in the
-                * snd_sof_widget.
-                */
-               memcpy(&dai->comp_dai, comp_dai, sizeof(*comp_dai));
+               dai->comp_dai = comp_dai;
        }
 
-finish:
-       kfree(comp_dai);
        return ret;
 }
 
@@ -2429,6 +2421,7 @@ static int sof_widget_unload(struct snd_soc_component *scomp,
                dai = swidget->private;
 
                if (dai) {
+                       kfree(dai->comp_dai);
                        /* free dai config */
                        kfree(dai->dai_config);
                        list_del(&dai->list);
@@ -2668,7 +2661,7 @@ static int sof_set_dai_config_multi(struct snd_sof_dev *sdev, u32 size,
                         * dai_index.
                         */
                        for (i = 0; i < num_conf; i++)
-                               config[i].dai_index = dai->comp_dai.dai_index;
+                               config[i].dai_index = dai->comp_dai->dai_index;
 
                        dev_dbg(sdev->dev, "set DAI config for %s index %d\n",
                                dai->name, config[curr_conf].dai_index);