ASoC: SOF: ipc4-topology: Add control IO ops
authorRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Thu, 9 Jun 2022 03:26:30 +0000 (20:26 -0700)
committerMark Brown <broonie@kernel.org>
Fri, 10 Jun 2022 12:31:58 +0000 (13:31 +0100)
Define the kcontrol IO ops for volume type controls for IPC4. Support
for other kcontrol types will be added later.

Co-developed-by: Rander Wang <rander.wang@linux.intel.com>
Signed-off-by: Rander Wang <rander.wang@linux.intel.com>
Co-developed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20220609032643.916882-11-ranjani.sridharan@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sof/Makefile
sound/soc/sof/ipc4-control.c [new file with mode: 0644]
sound/soc/sof/ipc4-priv.h
sound/soc/sof/ipc4-topology.c

index 73524fadb3ce7e3f5bf4ae43611a8f099a813bdc..1e15937f2bde7ab8831921e64a699e325c56e28a 100644 (file)
@@ -4,7 +4,7 @@ snd-sof-objs := core.o ops.o loader.o ipc.o pcm.o pm.o debug.o topology.o\
                control.o trace.o iomem-utils.o sof-audio.o stream-ipc.o\
                ipc3-topology.o ipc3-control.o ipc3.o ipc3-pcm.o ipc3-loader.o\
                ipc3-dtrace.o\
-               ipc4.o ipc4-loader.o ipc4-topology.o
+               ipc4.o ipc4-loader.o ipc4-topology.o ipc4-control.o
 ifneq ($(CONFIG_SND_SOC_SOF_CLIENT),)
 snd-sof-objs += sof-client.o
 endif
diff --git a/sound/soc/sof/ipc4-control.c b/sound/soc/sof/ipc4-control.c
new file mode 100644 (file)
index 0000000..95ee121
--- /dev/null
@@ -0,0 +1,216 @@
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)
+//
+// This file is provided under a dual BSD/GPLv2 license.  When using or
+// redistributing this file, you may do so under either license.
+//
+// Copyright(c) 2022 Intel Corporation. All rights reserved.
+//
+//
+
+#include "sof-priv.h"
+#include "sof-audio.h"
+#include "ipc4-priv.h"
+#include "ipc4-topology.h"
+
+static int sof_ipc4_set_get_kcontrol_data(struct snd_sof_control *scontrol, bool set)
+{
+       struct sof_ipc4_control_data *cdata = scontrol->ipc_control_data;
+       struct snd_soc_component *scomp = scontrol->scomp;
+       struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);
+       const struct sof_ipc_ops *iops = sdev->ipc->ops;
+       struct sof_ipc4_msg *msg = &cdata->msg;
+       struct snd_sof_widget *swidget;
+       bool widget_found = false;
+
+       /* find widget associated with the control */
+       list_for_each_entry(swidget, &sdev->widget_list, list) {
+               if (swidget->comp_id == scontrol->comp_id) {
+                       widget_found = true;
+                       break;
+               }
+       }
+
+       if (!widget_found) {
+               dev_err(scomp->dev, "Failed to find widget for kcontrol %s\n", scontrol->name);
+               return -ENOENT;
+       }
+
+       /*
+        * Volatile controls should always be part of static pipelines and the widget use_count
+        * would always be > 0 in this case. For the others, just return the cached value if the
+        * widget is not set up.
+        */
+       if (!swidget->use_count)
+               return 0;
+
+       msg->primary &= ~SOF_IPC4_MOD_INSTANCE_MASK;
+       msg->primary |= SOF_IPC4_MOD_INSTANCE(swidget->instance_id);
+
+       return iops->set_get_data(sdev, msg, msg->data_size, set);
+}
+
+static int
+sof_ipc4_set_volume_data(struct snd_sof_dev *sdev, struct snd_sof_widget *swidget,
+                        struct snd_sof_control *scontrol)
+{
+       struct sof_ipc4_control_data *cdata = scontrol->ipc_control_data;
+       struct sof_ipc4_gain *gain = swidget->private;
+       struct sof_ipc4_msg *msg = &cdata->msg;
+       struct sof_ipc4_gain_data data;
+       bool all_channels_equal = true;
+       u32 value;
+       int ret, i;
+
+       /* check if all channel values are equal */
+       value = cdata->chanv[0].value;
+       for (i = 1; i < scontrol->num_channels; i++) {
+               if (cdata->chanv[i].value != value) {
+                       all_channels_equal = false;
+                       break;
+               }
+       }
+
+       /*
+        * notify DSP with a single IPC message if all channel values are equal. Otherwise send
+        * a separate IPC for each channel.
+        */
+       for (i = 0; i < scontrol->num_channels; i++) {
+               if (all_channels_equal) {
+                       data.channels = SOF_IPC4_GAIN_ALL_CHANNELS_MASK;
+                       data.init_val = cdata->chanv[0].value;
+               } else {
+                       data.channels = cdata->chanv[i].channel;
+                       data.init_val = cdata->chanv[i].value;
+               }
+
+               /* set curve type and duration from topology */
+               data.curve_duration = gain->data.curve_duration;
+               data.curve_type = gain->data.curve_type;
+
+               msg->data_ptr = &data;
+               msg->data_size = sizeof(data);
+
+               ret = sof_ipc4_set_get_kcontrol_data(scontrol, true);
+               msg->data_ptr = NULL;
+               msg->data_size = 0;
+               if (ret < 0) {
+                       dev_err(sdev->dev, "Failed to set volume update for %s\n",
+                               scontrol->name);
+                       return ret;
+               }
+
+               if (all_channels_equal)
+                       break;
+       }
+
+       return 0;
+}
+
+static bool sof_ipc4_volume_put(struct snd_sof_control *scontrol,
+                               struct snd_ctl_elem_value *ucontrol)
+{
+       struct sof_ipc4_control_data *cdata = scontrol->ipc_control_data;
+       struct snd_soc_component *scomp = scontrol->scomp;
+       struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);
+       unsigned int channels = scontrol->num_channels;
+       struct snd_sof_widget *swidget;
+       bool widget_found = false;
+       bool change = false;
+       unsigned int i;
+       int ret;
+
+       /* update each channel */
+       for (i = 0; i < channels; i++) {
+               u32 value = mixer_to_ipc(ucontrol->value.integer.value[i],
+                                        scontrol->volume_table, scontrol->max + 1);
+
+               change = change || (value != cdata->chanv[i].value);
+               cdata->chanv[i].channel = i;
+               cdata->chanv[i].value = value;
+       }
+
+       if (!pm_runtime_active(scomp->dev))
+               return change;
+
+       /* find widget associated with the control */
+       list_for_each_entry(swidget, &sdev->widget_list, list) {
+               if (swidget->comp_id == scontrol->comp_id) {
+                       widget_found = true;
+                       break;
+               }
+       }
+
+       if (!widget_found) {
+               dev_err(scomp->dev, "Failed to find widget for kcontrol %s\n", scontrol->name);
+               return -ENOENT;
+       }
+
+       ret = sof_ipc4_set_volume_data(sdev, swidget, scontrol);
+       if (ret < 0)
+               return false;
+
+       return change;
+}
+
+static int sof_ipc4_volume_get(struct snd_sof_control *scontrol,
+                              struct snd_ctl_elem_value *ucontrol)
+{
+       struct sof_ipc4_control_data *cdata = scontrol->ipc_control_data;
+       unsigned int channels = scontrol->num_channels;
+       unsigned int i;
+
+       for (i = 0; i < channels; i++)
+               ucontrol->value.integer.value[i] = ipc_to_mixer(cdata->chanv[i].value,
+                                                               scontrol->volume_table,
+                                                               scontrol->max + 1);
+
+       return 0;
+}
+
+/* set up all controls for the widget */
+static int sof_ipc4_widget_kcontrol_setup(struct snd_sof_dev *sdev, struct snd_sof_widget *swidget)
+{
+       struct snd_sof_control *scontrol;
+       int ret;
+
+       list_for_each_entry(scontrol, &sdev->kcontrol_list, list)
+               if (scontrol->comp_id == swidget->comp_id) {
+                       ret = sof_ipc4_set_volume_data(sdev, swidget, scontrol);
+                       if (ret < 0) {
+                               dev_err(sdev->dev, "%s: kcontrol %d set up failed for widget %s\n",
+                                       __func__, scontrol->comp_id, swidget->widget->name);
+                               return ret;
+                       }
+               }
+
+       return 0;
+}
+
+static int
+sof_ipc4_set_up_volume_table(struct snd_sof_control *scontrol, int tlv[SOF_TLV_ITEMS], int size)
+{
+       int i;
+
+       /* init the volume table */
+       scontrol->volume_table = kcalloc(size, sizeof(u32), GFP_KERNEL);
+       if (!scontrol->volume_table)
+               return -ENOMEM;
+
+       /* populate the volume table */
+       for (i = 0; i < size ; i++) {
+               u32 val = vol_compute_gain(i, tlv);
+               u64 q31val = ((u64)val) << 15; /* Can be over Q1.31, need to saturate */
+
+               scontrol->volume_table[i] = q31val > SOF_IPC4_VOL_ZERO_DB ?
+                                               SOF_IPC4_VOL_ZERO_DB : q31val;
+       }
+
+       return 0;
+}
+
+const struct sof_ipc_tplg_control_ops tplg_ipc4_control_ops = {
+       .volume_put = sof_ipc4_volume_put,
+       .volume_get = sof_ipc4_volume_get,
+       .widget_kcontrol_setup = sof_ipc4_widget_kcontrol_setup,
+       .set_up_volume_table = sof_ipc4_set_up_volume_table,
+};
index 5388b888fefa8ef9086dd920b71b6a42c08c1c65..d0b110811aebc18d07dead31158a80044908e768 100644 (file)
@@ -41,5 +41,6 @@ struct sof_ipc4_fw_module {
 
 extern const struct sof_ipc_fw_loader_ops ipc4_loader_ops;
 extern const struct sof_ipc_tplg_ops ipc4_tplg_ops;
+extern const struct sof_ipc_tplg_control_ops tplg_ipc4_control_ops;
 
 #endif
index 0c36b7cb6e797330fbcac996dc50422f3146be4f..3cebd6fe7cd1db9dcc96d2119a76e504920461a9 100644 (file)
@@ -1157,4 +1157,5 @@ const struct sof_ipc_tplg_ops ipc4_tplg_ops = {
        .widget = tplg_ipc4_widget_ops,
        .token_list = ipc4_token_list,
        .control_setup = sof_ipc4_control_setup,
+       .control = &tplg_ipc4_control_ops,
 };