ASoC: SOF: Drop ctrl_type parameter for snd_sof_ipc_set_get_comp_data()

The SOF_CTRL_TYPE_VALUE_COMP_* type is not used by the firmware nor in the
kernel side.
It is also not clear what action should be taken for such type.

With this in mind:
The correct ipc_cmd can be selected based on the `ctrl_cmd` and the `set`
parameters:
if the ctrl_cmd is SOF_CTRL_CMD_BINARY then SOF_CTRL_TYPE_DATA_*
otherwise SOF_CTRL_TYPE_VALUE_CHAN_*.

The SET or GET direction can be selected with the use of `set` parameter.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20211215180404.53254-8-ranjani.sridharan@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/control.c b/sound/soc/sof/control.c
index dac0b630b6a078d2c2be641001a5fdd1568a5f6c..ef61936dad59451421ece5a30484ede23f9e5193 100644 (file)
--- a/sound/soc/sof/control.c
+++ b/sound/soc/sof/control.c
@@ -83,8 +83,7 @@ static void snd_sof_refresh_control(struct snd_sof_control *scontrol)
 
        /* refresh the component data from DSP */
        scontrol->comp_data_dirty = false;
-       ret = snd_sof_ipc_set_get_comp_data(scontrol,
-                                           SOF_CTRL_TYPE_VALUE_CHAN_GET, false);
+       ret = snd_sof_ipc_set_get_comp_data(scontrol, false);
        if (ret < 0) {
                dev_err(scomp->dev, "error: failed to get control data: %d\n", ret);
                /* Set the flag to re-try next time to get the data */
@@ -135,8 +134,7 @@ int snd_sof_volume_put(struct snd_kcontrol *kcontrol,
 
        /* notify DSP of mixer updates */
        if (pm_runtime_active(scomp->dev))
-               snd_sof_ipc_set_get_comp_data(scontrol,
-                                             SOF_CTRL_TYPE_VALUE_CHAN_SET, true);
+               snd_sof_ipc_set_get_comp_data(scontrol, true);
        return change;
 }
 
@@ -205,8 +203,7 @@ int snd_sof_switch_put(struct snd_kcontrol *kcontrol,
 
        /* notify DSP of mixer updates */
        if (pm_runtime_active(scomp->dev))
-               snd_sof_ipc_set_get_comp_data(scontrol,
-                                             SOF_CTRL_TYPE_VALUE_CHAN_SET, true);
+               snd_sof_ipc_set_get_comp_data(scontrol, true);
 
        return change;
 }
@@ -251,8 +248,7 @@ int snd_sof_enum_put(struct snd_kcontrol *kcontrol,
 
        /* notify DSP of enum updates */
        if (pm_runtime_active(scomp->dev))
-               snd_sof_ipc_set_get_comp_data(scontrol,
-                                             SOF_CTRL_TYPE_VALUE_CHAN_SET, true);
+               snd_sof_ipc_set_get_comp_data(scontrol, true);
 
        return change;
 }
@@ -326,8 +322,7 @@ int snd_sof_bytes_put(struct snd_kcontrol *kcontrol,
 
        /* notify DSP of byte control updates */
        if (pm_runtime_active(scomp->dev))
-               snd_sof_ipc_set_get_comp_data(scontrol,
-                                             SOF_CTRL_TYPE_DATA_SET, true);
+               snd_sof_ipc_set_get_comp_data(scontrol, true);
 
        return 0;
 }
@@ -403,8 +398,7 @@ int snd_sof_bytes_ext_put(struct snd_kcontrol *kcontrol,
 
        /* notify DSP of byte control updates */
        if (pm_runtime_active(scomp->dev))
-               snd_sof_ipc_set_get_comp_data(scontrol,
-                                             SOF_CTRL_TYPE_DATA_SET, true);
+               snd_sof_ipc_set_get_comp_data(scontrol, true);
 
        return 0;
 }
@@ -441,7 +435,7 @@ int snd_sof_bytes_ext_volatile_get(struct snd_kcontrol *kcontrol, unsigned int _
        cdata->data->magic = SOF_ABI_MAGIC;
        cdata->data->abi = SOF_ABI_VERSION;
        /* get all the component data from DSP */
-       ret = snd_sof_ipc_set_get_comp_data(scontrol, SOF_CTRL_TYPE_DATA_GET, false);
+       ret = snd_sof_ipc_set_get_comp_data(scontrol, false);
        if (ret < 0)
                goto out;
 

diff --git a/sound/soc/sof/ipc.c b/sound/soc/sof/ipc.c
index 69c8a9964960f2733746cdda279164f0fedafeba..8a1eacc7ec5fdd5929eefc4a835e16ac900bb284 100644 (file)
--- a/sound/soc/sof/ipc.c
+++ b/sound/soc/sof/ipc.c
@@ -721,11 +721,6 @@ static int sof_get_ctrl_copy_params(enum sof_ipc_ctrl_type ctrl_type,
                sparams->src = (u8 *)src->chanv;
                sparams->dst = (u8 *)dst->chanv;
                break;
-       case SOF_CTRL_TYPE_VALUE_COMP_GET:
-       case SOF_CTRL_TYPE_VALUE_COMP_SET:
-               sparams->src = (u8 *)src->compv;
-               sparams->dst = (u8 *)dst->compv;
-               break;
        case SOF_CTRL_TYPE_DATA_GET:
        case SOF_CTRL_TYPE_DATA_SET:
                sparams->src = (u8 *)src->data->data;
@@ -816,8 +811,7 @@ static int sof_set_get_large_ctrl_data(struct snd_sof_dev *sdev,
 /*
  * IPC get()/set() for kcontrols.
  */
-int snd_sof_ipc_set_get_comp_data(struct snd_sof_control *scontrol,
-                                 enum sof_ipc_ctrl_type ctrl_type, bool set)
+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;
@@ -825,6 +819,7 @@ int snd_sof_ipc_set_get_comp_data(struct snd_sof_control *scontrol,
        struct sof_ipc_fw_ready *ready = &sdev->fw_ready;
        struct sof_ipc_fw_version *v = &ready->version;
        struct sof_ipc_ctrl_data_params sparams;
+       enum sof_ipc_ctrl_type ctrl_type;
        struct snd_sof_widget *swidget;
        bool widget_found = false;
        size_t send_bytes;
@@ -872,11 +867,19 @@ int snd_sof_ipc_set_get_comp_data(struct snd_sof_control *scontrol,
                return err;
        }
 
-       /* Select the IPC cmd based on the ctrl_cmd and the direction */
-       if (cdata->cmd == SOF_CTRL_CMD_BINARY)
+       /*
+        * Select the IPC cmd and the ctrl_type based on the ctrl_cmd and the
+        * direction
+        * Note: SOF_CTRL_TYPE_VALUE_COMP_* is not used and supported currently
+        *       for ctrl_type
+        */
+       if (cdata->cmd == SOF_CTRL_CMD_BINARY) {
                ipc_cmd = set ? SOF_IPC_COMP_SET_DATA : SOF_IPC_COMP_GET_DATA;
-       else
+               ctrl_type = set ? SOF_CTRL_TYPE_DATA_SET : SOF_CTRL_TYPE_DATA_GET;
+       } else {
                ipc_cmd = set ? SOF_IPC_COMP_SET_VALUE : SOF_IPC_COMP_GET_VALUE;
+               ctrl_type = set ? SOF_CTRL_TYPE_VALUE_CHAN_SET : SOF_CTRL_TYPE_VALUE_CHAN_GET;
+       }
 
        cdata->rhdr.hdr.cmd = SOF_IPC_GLB_COMP_MSG | ipc_cmd;
        cdata->type = ctrl_type;
@@ -892,13 +895,6 @@ int snd_sof_ipc_set_get_comp_data(struct snd_sof_control *scontrol,
                sparams.hdr_bytes = sizeof(struct sof_ipc_ctrl_data);
                sparams.elems = scontrol->num_channels;
                break;
-       case SOF_CTRL_TYPE_VALUE_COMP_GET:
-       case SOF_CTRL_TYPE_VALUE_COMP_SET:
-               sparams.msg_bytes = scontrol->num_channels *
-                       sizeof(struct sof_ipc_ctrl_value_comp);
-               sparams.hdr_bytes = sizeof(struct sof_ipc_ctrl_data);
-               sparams.elems = scontrol->num_channels;
-               break;
        case SOF_CTRL_TYPE_DATA_GET:
        case SOF_CTRL_TYPE_DATA_SET:
                sparams.msg_bytes = cdata->data->size;

diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c
index 4530c6ed34e060d3260071372593aa345532aae0..735fbc5fe1bd34ac48a3fffc599a715bae277b33 100644 (file)
--- a/sound/soc/sof/sof-audio.c
+++ b/sound/soc/sof/sof-audio.c
@@ -14,27 +14,12 @@
 
 static int sof_kcontrol_setup(struct snd_sof_dev *sdev, struct snd_sof_control *scontrol)
 {
-       enum sof_ipc_ctrl_type ctrl_type;
        int ret;
 
        /* reset readback offset for scontrol */
        scontrol->readback_offset = 0;
 
-       /* notify DSP of kcontrol values */
-       switch (scontrol->control_data->cmd) {
-       case SOF_CTRL_CMD_VOLUME:
-       case SOF_CTRL_CMD_ENUM:
-       case SOF_CTRL_CMD_SWITCH:
-               ctrl_type = SOF_CTRL_TYPE_VALUE_CHAN_SET;
-               break;
-       case SOF_CTRL_CMD_BINARY:
-               ctrl_type = SOF_CTRL_TYPE_DATA_SET;
-               break;
-       default:
-               return 0;
-       }
-
-       ret = snd_sof_ipc_set_get_comp_data(scontrol, ctrl_type, true);
+       ret = snd_sof_ipc_set_get_comp_data(scontrol, true);
        if (ret < 0)
                dev_err(sdev->dev, "error: failed kcontrol value set for widget: %d\n",
                        scontrol->comp_id);

diff --git a/sound/soc/sof/sof-audio.h b/sound/soc/sof/sof-audio.h
index 84a8ebe3b1c33b36afa15252e3e406f03116e60a..f3009e6b91a10b1fe9471da670d3fe6f76295ea4 100644 (file)
--- a/sound/soc/sof/sof-audio.h
+++ b/sound/soc/sof/sof-audio.h
@@ -238,8 +238,7 @@ static inline void snd_sof_compr_init_elapsed_work(struct work_struct *work) { }
 /*
  * Mixer IPC
  */
-int snd_sof_ipc_set_get_comp_data(struct snd_sof_control *scontrol,
-                                 enum sof_ipc_ctrl_type ctrl_type, bool set);
+int snd_sof_ipc_set_get_comp_data(struct snd_sof_control *scontrol, bool set);
 
 /* DAI link fixup */
 int sof_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params);