Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Capture hw mute indicator #5310

Draft
wants to merge 5 commits into
base: topic/sof-dev
Choose a base branch
from
Draft
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
ASoC: sof: ipc4-control: Global mixers and capture hw mute indicator
Implement global kcontrol concept and add capture hw mute indicator
implementation in it.

Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>
  • Loading branch information
Jyri Sarha committed Jan 28, 2025
commit a6f05dc6d49e7b5a250eb9d67c70e8db3d94dcd5
135 changes: 134 additions & 1 deletion sound/soc/sof/ipc4-control.c
Original file line number Diff line number Diff line change
@@ -649,6 +649,130 @@ sof_ipc4_volsw_setup(struct snd_sof_dev *sdev, struct snd_sof_widget *swidget,
return sof_ipc4_set_volume_data(sdev, swidget, scontrol, false);
}

struct sof_ipc4_kcontrol_global_priv {
struct snd_card *snd_card;
struct snd_kcontrol *capture_hw_mute;
};

static int sof_ipc4_capture_hw_mute_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
ucontrol->value.integer.value[0] = kcontrol->private_value;
return 0;
}

static const struct snd_kcontrol_new sof_ipc4_capture_hw_mute = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.access = SNDRV_CTL_ELEM_ACCESS_READ,
.name = "Global capture HW mute indicator",
.info = snd_ctl_boolean_mono_info,
.get = sof_ipc4_capture_hw_mute_get,
};

static struct snd_card *sof_scomp_get_card(struct snd_soc_component *scomp)
{
struct device *dev = scomp->dev;

if (!scomp->card) {
dev_err(dev, "%s: No snd_soc_card", __func__);
return NULL;
}

return scomp->card->snd_card;
}

static int sof_ipc4_create_non_topology_controls(struct snd_sof_dev *sdev,
struct snd_soc_component *scomp)
{
struct sof_ipc4_fw_data *ipc4_data = sdev->private;
struct snd_card *snd_card = sof_scomp_get_card(scomp);
struct device *dev = sdev->dev;
struct sof_ipc4_kcontrol_global_priv *priv;
int ret;

if (!snd_card) {
dev_err(dev, "%s: Card not found!", __func__);
return -ENODEV;
}

if (!ipc4_data->global_kcontrol_mask)
return 0;

priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
if (!priv)
return -ENOMEM;

priv->snd_card = snd_card;

if (ipc4_data->global_kcontrol_mask &
BIT(SOF_IPC4_KCONTROL_GLOBAL_CAPTURE_HW_MUTE)) {
struct snd_kcontrol *kctl;

kctl = snd_ctl_new1(&sof_ipc4_capture_hw_mute, NULL);
if (!kctl) {
dev_err(dev, "%s: snd_ctl_new1(): failed", __func__);
return -EINVAL;
}

kctl->private_value = 0;

ret = snd_ctl_add(snd_card, kctl);
if (ret < 0)
dev_err(dev, "%s: snd_ctl_add(): failed", __func__);
else
priv->capture_hw_mute = kctl;
}

ipc4_data->global_kcontrol_priv = priv;

return 0;
}

static void snd_ipc4_global_capture_hw_mute_report(struct snd_sof_dev *sdev,
bool status)
{
struct sof_ipc4_fw_data *ipc4_data = sdev->private;
struct sof_ipc4_kcontrol_global_priv *priv = ipc4_data->global_kcontrol_priv;
struct device *dev = sdev->dev;
struct snd_kcontrol *kctl;

if (!priv || !priv->capture_hw_mute)
return;

kctl = priv->capture_hw_mute;

dev_dbg(dev, "%s: reporting %u, old %lu", __func__,
status, kctl->private_value);

if (kctl->private_value == status)
return;

kctl->private_value = status;
snd_ctl_notify(priv->snd_card, SNDRV_CTL_EVENT_MASK_VALUE, &kctl->id);
}

static void snd_ipc4_handle_global_event(struct snd_sof_dev *sdev,
struct sof_ipc4_control_msg_payload *msg_data)
{
struct device *dev = sdev->dev;

dev_dbg(dev, "%s: got msg id %u num_elems %u", __func__,
msg_data->id, msg_data->num_elems);

switch (msg_data->id) {
case SOF_IPC4_KCONTROL_GLOBAL_CAPTURE_HW_MUTE:
if (msg_data->num_elems == 1 || msg_data->chanv[0].channel == 0)
snd_ipc4_global_capture_hw_mute_report(sdev, msg_data->chanv[0].value);
else
dev_warn(dev, "%s: bad data for id %u chan 0 %u", __func__,
msg_data->id, msg_data->chanv[0].channel);
break;
default:
dev_warn(dev, "%s: unknown global control elem id %u", __func__,
msg_data->id);
}
}

#define PARAM_ID_FROM_EXTENSION(_ext) (((_ext) & SOF_IPC4_MOD_EXT_MSG_PARAM_ID_MASK) \
>> SOF_IPC4_MOD_EXT_MSG_PARAM_ID_SHIFT)

@@ -673,6 +797,7 @@ static void sof_ipc4_control_update(struct snd_sof_dev *sdev, void *ipc_message)
ndata->event_data_size);
return;
}
msg_data = (struct sof_ipc4_control_msg_payload *)ndata->event_data;

event_param_id = ndata->event_id & SOF_IPC4_NOTIFY_MODULE_EVENTID_ALSA_PARAMID_MASK;
switch (event_param_id) {
@@ -690,6 +815,14 @@ static void sof_ipc4_control_update(struct snd_sof_dev *sdev, void *ipc_message)
return;
}

if (ndata->module_id == SOF_IPC4_MOD_INIT_BASEFW_MOD_ID &&
ndata->instance_id == SOF_IPC4_MOD_INIT_BASEFW_INSTANCE_ID) {
dev_dbg(sdev->dev, "Received global notifier event_id %#x",
event_param_id);
jsarha marked this conversation as resolved.
Show resolved Hide resolved
snd_ipc4_handle_global_event(sdev, msg_data);
return;
}

/* Find the swidget based on ndata->module_id and ndata->instance_id */
swidget = sof_ipc4_find_swidget_by_ids(sdev, ndata->module_id,
ndata->instance_id);
@@ -700,7 +833,6 @@ static void sof_ipc4_control_update(struct snd_sof_dev *sdev, void *ipc_message)
}

/* Find the scontrol which is the source of the notification */
msg_data = (struct sof_ipc4_control_msg_payload *)ndata->event_data;
list_for_each_entry(scontrol, &sdev->kcontrol_list, list) {
if (scontrol->comp_id == swidget->comp_id) {
u32 local_param_id;
@@ -855,4 +987,5 @@ const struct sof_ipc_tplg_control_ops tplg_ipc4_control_ops = {
.update = sof_ipc4_control_update,
.widget_kcontrol_setup = sof_ipc4_widget_kcontrol_setup,
.set_up_volume_table = sof_ipc4_set_up_volume_table,
.create_non_topology_controls = sof_ipc4_create_non_topology_controls,
};
3 changes: 3 additions & 0 deletions sound/soc/sof/ipc4-loader.c
Original file line number Diff line number Diff line change
@@ -411,6 +411,9 @@ int sof_ipc4_query_fw_configuration(struct snd_sof_dev *sdev)
case SOF_IPC4_FW_CONTEXT_SAVE:
ipc4_data->fw_context_save = *tuple->value;
break;
case SOF_IPC4_FW_GLOBAL_KCONTROL_MASK:
ipc4_data->global_kcontrol_mask = *tuple->value;
break;
default:
break;
}
2 changes: 2 additions & 0 deletions sound/soc/sof/ipc4-priv.h
Original file line number Diff line number Diff line change
@@ -86,6 +86,8 @@ struct sof_ipc4_fw_data {
int max_num_pipelines;
u32 max_libs_count;
bool fw_context_save;
u32 global_kcontrol_mask;
void *global_kcontrol_priv;

int (*load_library)(struct snd_sof_dev *sdev,
struct sof_ipc4_fw_library *fw_lib, bool reload);
2 changes: 2 additions & 0 deletions sound/soc/sof/sof-audio.h
Original file line number Diff line number Diff line change
@@ -166,6 +166,8 @@ struct sof_ipc_tplg_control_ops {
/* mandatory callback to set up volume table for volume kcontrols */
int (*set_up_volume_table)(struct snd_sof_control *scontrol, int tlv[SOF_TLV_ITEMS],
int size);
int (*create_non_topology_controls)(struct snd_sof_dev *sdev,
struct snd_soc_component *scomp);
};

/**
11 changes: 9 additions & 2 deletions sound/soc/sof/topology.c
Original file line number Diff line number Diff line change
@@ -2251,8 +2251,15 @@ static int sof_complete(struct snd_soc_component *scomp)
}

/* set up static pipelines */
if (tplg_ops && tplg_ops->set_up_all_pipelines)
return tplg_ops->set_up_all_pipelines(sdev, false);
if (tplg_ops && tplg_ops->set_up_all_pipelines) {
ret = tplg_ops->set_up_all_pipelines(sdev, false);
if (ret < 0)
return ret;
}

/* set up non topology mixers */
if (tplg_ops && tplg_ops->control && tplg_ops->control->create_non_topology_controls)
return tplg_ops->control->create_non_topology_controls(sdev, scomp);

return 0;
}