ASoC: Intel: avs: Update VOLUME and add MUTE IPCs

For mute kcontrols to have an effect add IPCs for triggering the mute
operation on the DSP side. On top of basic get/set, an aggregated
variant of the latter is provided for both MUTE and, to already present
VOLUME IPC. It allows for efficient transmission of multiple parameters
at once.

While at it, sort the functions - getters come before setters in the
AudioDSP firmware interface as well as in the kcontrol one.

Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://patch.msgid.link/20250217102115.3539427-6-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/avs/messages.c b/sound/soc/intel/avs/messages.c
index 242a175381c268e272b0c737866983ce541a3617..a5ba279830912fe16efbdbfc63288346fa03c20c 100644 (file)
--- a/sound/soc/intel/avs/messages.c
+++ b/sound/soc/intel/avs/messages.c
@@ -677,13 +677,6 @@ int avs_ipc_copier_set_sink_format(struct avs_dev *adev, u16 module_id,
                                        (u8 *)&cpr_fmt, sizeof(cpr_fmt));
 }
 
-int avs_ipc_peakvol_set_volume(struct avs_dev *adev, u16 module_id, u8 instance_id,
-                              struct avs_volume_cfg *vol)
-{
-       return avs_ipc_set_large_config(adev, module_id, instance_id, AVS_PEAKVOL_VOLUME, (u8 *)vol,
-                                       sizeof(*vol));
-}
-
 int avs_ipc_peakvol_get_volume(struct avs_dev *adev, u16 module_id, u8 instance_id,
                               struct avs_volume_cfg **vols, size_t *num_vols)
 {
@@ -706,6 +699,110 @@ int avs_ipc_peakvol_get_volume(struct avs_dev *adev, u16 module_id, u8 instance_
        return 0;
 }
 
+int avs_ipc_peakvol_set_volume(struct avs_dev *adev, u16 module_id, u8 instance_id,
+                              struct avs_volume_cfg *vol)
+{
+       return avs_ipc_set_large_config(adev, module_id, instance_id, AVS_PEAKVOL_VOLUME,
+                                       (u8 *)vol, sizeof(*vol));
+}
+
+int avs_ipc_peakvol_set_volumes(struct avs_dev *adev, u16 module_id, u8 instance_id,
+                               struct avs_volume_cfg *vols, size_t num_vols)
+{
+       struct avs_tlv *tlv;
+       size_t offset;
+       size_t size;
+       u8 *payload;
+       int ret, i;
+
+       size = num_vols * sizeof(*vols);
+       size += num_vols * sizeof(*tlv);
+       if (size > AVS_MAILBOX_SIZE)
+               return -EINVAL;
+
+       payload = kzalloc(AVS_MAILBOX_SIZE, GFP_KERNEL);
+       if (!payload)
+               return -ENOMEM;
+
+       for (offset = i = 0; i < num_vols; i++) {
+               tlv = (struct avs_tlv *)(payload + offset);
+
+               tlv->type = AVS_PEAKVOL_VOLUME;
+               tlv->length = sizeof(*vols);
+               memcpy(tlv->value, &vols[i], tlv->length);
+
+               offset += sizeof(*tlv) + tlv->length;
+       }
+
+       ret = avs_ipc_set_large_config(adev, module_id, instance_id, AVS_VENDOR_CONFIG, payload,
+                                      size);
+       kfree(payload);
+       return ret;
+}
+
+int avs_ipc_peakvol_get_mute(struct avs_dev *adev, u16 module_id, u8 instance_id,
+                            struct avs_mute_cfg **mutes, size_t *num_mutes)
+{
+       size_t payload_size;
+       u8 *payload;
+       int ret;
+
+       ret = avs_ipc_get_large_config(adev, module_id, instance_id, AVS_PEAKVOL_MUTE, NULL, 0,
+                                      &payload, &payload_size);
+       if (ret)
+               return ret;
+
+       /* Non-zero payload expected for PEAKVOL_MUTE. */
+       if (!payload_size)
+               return -EREMOTEIO;
+
+       *mutes = (struct avs_mute_cfg *)payload;
+       *num_mutes = payload_size / sizeof(**mutes);
+
+       return 0;
+}
+
+int avs_ipc_peakvol_set_mute(struct avs_dev *adev, u16 module_id, u8 instance_id,
+                            struct avs_mute_cfg *mute)
+{
+       return avs_ipc_set_large_config(adev, module_id, instance_id, AVS_PEAKVOL_MUTE,
+                                       (u8 *)mute, sizeof(*mute));
+}
+
+int avs_ipc_peakvol_set_mutes(struct avs_dev *adev, u16 module_id, u8 instance_id,
+                             struct avs_mute_cfg *mutes, size_t num_mutes)
+{
+       struct avs_tlv *tlv;
+       size_t offset;
+       size_t size;
+       u8 *payload;
+       int ret, i;
+
+       size = num_mutes * sizeof(*mutes);
+       size += num_mutes * sizeof(*tlv);
+       if (size > AVS_MAILBOX_SIZE)
+               return -EINVAL;
+
+       payload = kzalloc(AVS_MAILBOX_SIZE, GFP_KERNEL);
+       if (!payload)
+               return -ENOMEM;
+
+       for (offset = i = 0; i < num_mutes; i++) {
+               tlv = (struct avs_tlv *)(payload + offset);
+
+               tlv->type = AVS_PEAKVOL_MUTE;
+               tlv->length = sizeof(*mutes);
+               memcpy(tlv->value, &mutes[i], tlv->length);
+
+               offset += sizeof(*tlv) + tlv->length;
+       }
+
+       ret = avs_ipc_set_large_config(adev, module_id, instance_id, AVS_VENDOR_CONFIG, payload,
+                                      size);
+       kfree(payload);
+       return ret;
+}
+
 #ifdef CONFIG_DEBUG_FS
 int avs_ipc_set_enable_logs(struct avs_dev *adev, u8 *log_info, size_t size)
 {

diff --git a/sound/soc/intel/avs/messages.h b/sound/soc/intel/avs/messages.h
index f44fcfc81de7541da6e4b1e37b07311b7f47a36b..2f243802ccc289ce82cbb9609d89d329b5da0b0e 100644 (file)
--- a/sound/soc/intel/avs/messages.h
+++ b/sound/soc/intel/avs/messages.h
@@ -814,6 +814,15 @@ struct avs_volume_cfg {
 } __packed;
 static_assert(sizeof(struct avs_volume_cfg) == 24);
 
+struct avs_mute_cfg {
+       u32 channel_id;
+       u32 mute;
+       u32 curve_type;
+       u32 reserved; /* alignment */
+       u64 curve_duration;
+} __packed;
+static_assert(sizeof(struct avs_mute_cfg) == 24);
+
 struct avs_peakvol_cfg {
        struct avs_modcfg_base base;
        struct avs_volume_cfg vols[];
@@ -896,6 +905,8 @@ static_assert(sizeof(struct avs_whm_cfg) == 108);
 
 /* Module runtime parameters */
 
+#define AVS_VENDOR_CONFIG      0xFF
+
 enum avs_copier_runtime_param {
        AVS_COPIER_SET_SINK_FORMAT = 2,
 };
@@ -914,6 +925,7 @@ int avs_ipc_copier_set_sink_format(struct avs_dev *adev, u16 module_id,
 
 enum avs_peakvol_runtime_param {
        AVS_PEAKVOL_VOLUME = 0,
+       AVS_PEAKVOL_MUTE = 3,
 };
 
 enum avs_audio_curve_type {
@@ -921,10 +933,18 @@ enum avs_audio_curve_type {
        AVS_AUDIO_CURVE_WINDOWS_FADE = 1,
 };
 
-int avs_ipc_peakvol_set_volume(struct avs_dev *adev, u16 module_id, u8 instance_id,
-                              struct avs_volume_cfg *vol);
 int avs_ipc_peakvol_get_volume(struct avs_dev *adev, u16 module_id, u8 instance_id,
                               struct avs_volume_cfg **vols, size_t *num_vols);
+int avs_ipc_peakvol_set_volume(struct avs_dev *adev, u16 module_id, u8 instance_id,
+                              struct avs_volume_cfg *vol);
+int avs_ipc_peakvol_set_volumes(struct avs_dev *adev, u16 module_id, u8 instance_id,
+                               struct avs_volume_cfg *vols, size_t num_vols);
+int avs_ipc_peakvol_get_mute(struct avs_dev *adev, u16 module_id, u8 instance_id,
+                            struct avs_mute_cfg **mutes, size_t *num_mutes);
+int avs_ipc_peakvol_set_mute(struct avs_dev *adev, u16 module_id, u8 instance_id,
+                            struct avs_mute_cfg *mute);
+int avs_ipc_peakvol_set_mutes(struct avs_dev *adev, u16 module_id, u8 instance_id,
+                             struct avs_mute_cfg *mutes, size_t num_mutes);
 
 #define AVS_PROBE_INST_ID      0