[alsa-devel] [PATCH 1/5] ASoC: Correct typo in SOC_VALUE_ENUM_SINGLE macro
xnitmes is clearly intended to be xnitems, but all other macros just refer to this as xitems, so change it to that.
Signed-off-by: Charles Keepax ckeepax@opensource.wolfsonmicro.com --- include/sound/soc.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/sound/soc.h b/include/sound/soc.h index a73d855..45cfd69 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -190,8 +190,8 @@ #define SOC_VALUE_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xmask, xitems, xtexts, xvalues) \ { .reg = xreg, .shift_l = xshift_l, .shift_r = xshift_r, \ .mask = xmask, .items = xitems, .texts = xtexts, .values = xvalues} -#define SOC_VALUE_ENUM_SINGLE(xreg, xshift, xmask, xnitmes, xtexts, xvalues) \ - SOC_VALUE_ENUM_DOUBLE(xreg, xshift, xshift, xmask, xnitmes, xtexts, xvalues) +#define SOC_VALUE_ENUM_SINGLE(xreg, xshift, xmask, xitems, xtexts, xvalues) \ + SOC_VALUE_ENUM_DOUBLE(xreg, xshift, xshift, xmask, xitems, xtexts, xvalues) #define SOC_ENUM_SINGLE_VIRT(xitems, xtexts) \ SOC_ENUM_SINGLE(SND_SOC_NOPM, 0, xitems, xtexts) #define SOC_ENUM(xname, xenum) \
The memory subsystem is pretty chatty on failure no need to have local OOM messages as well.
Signed-off-by: Charles Keepax ckeepax@opensource.wolfsonmicro.com --- sound/soc/soc-dapm.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 79b9478..beb48b6 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -310,12 +310,8 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget, struct soc_mixer_control *mc;
data = kzalloc(sizeof(*data), GFP_KERNEL); - if (!data) { - dev_err(widget->dapm->dev, - "ASoC: can't allocate kcontrol data for %s\n", - widget->name); + if (!data) return -ENOMEM; - }
INIT_LIST_HEAD(&data->paths);
This makes it a little easier to follow what is happening in debugfs. Additionally is also useful in facilitating work to add autodisable muxes because the control name is already used for the mux widget and thus shouldn't be reused for the autodisable widget.
Signed-off-by: Charles Keepax ckeepax@opensource.wolfsonmicro.com --- sound/soc/soc-dapm.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index beb48b6..e557018 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -308,11 +308,19 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget, { struct dapm_kcontrol_data *data; struct soc_mixer_control *mc; + const char *name; + int ret;
data = kzalloc(sizeof(*data), GFP_KERNEL); if (!data) return -ENOMEM;
+ name = kasprintf(GFP_KERNEL, "%s %s", kcontrol->id.name, "Autodisable"); + if (!name) { + ret = -ENOMEM; + goto err_data; + } + INIT_LIST_HEAD(&data->paths);
switch (widget->id) { @@ -334,15 +342,15 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget, template.off_val = 0; template.on_val = template.off_val; template.id = snd_soc_dapm_kcontrol; - template.name = kcontrol->id.name; + template.name = name;
data->value = template.on_val;
data->widget = snd_soc_dapm_new_control(widget->dapm, &template); if (!data->widget) { - kfree(data); - return -ENOMEM; + ret = -ENOMEM; + goto err_name; } } break; @@ -353,11 +361,19 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget, kcontrol->private_data = data;
return 0; + +err_name: + kfree(name); +err_data: + kfree(data); + return ret; }
static void dapm_kcontrol_free(struct snd_kcontrol *kctl) { struct dapm_kcontrol_data *data = snd_kcontrol_chip(kctl); + if (data->widget) + kfree(data->widget->name); kfree(data->wlist); kfree(data); }
Commit 57295073b6ac ("ASoC: dapm: Implement mixer input auto-disable") added support for autodisable controls, controls whose values are only written to the hardware when their respective widgets are powered up. But it only added support for controls based on the mixer abstraction.
This patch add support for mux controls (DAPM controls based on the enum abstraction) to be auto-disabled as well. As each mux can only have a single control, there is no need to tie the autodisable widget to the inputs (as is done for the mixer controls) it can be tided directly to the mux widget itself.
Signed-off-by: Charles Keepax ckeepax@opensource.wolfsonmicro.com --- include/sound/soc.h | 10 ++++++++ sound/soc/soc-dapm.c | 62 +++++++++++++++++++++++++++++++++++++------------ 2 files changed, 57 insertions(+), 15 deletions(-)
diff --git a/include/sound/soc.h b/include/sound/soc.h index 45cfd69..28b8ae6 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -192,6 +192,10 @@ .mask = xmask, .items = xitems, .texts = xtexts, .values = xvalues} #define SOC_VALUE_ENUM_SINGLE(xreg, xshift, xmask, xitems, xtexts, xvalues) \ SOC_VALUE_ENUM_DOUBLE(xreg, xshift, xshift, xmask, xitems, xtexts, xvalues) +#define SOC_VALUE_ENUM_SINGLE_AUTODISABLE(xreg, xshift, xmask, xitems, xtexts, xvalues) \ +{ .reg = xreg, .shift_l = xshift, .shift_r = xshift, \ + .mask = xmask, .items = xitems, .texts = xtexts, \ + .values = xvalues, .autodisable = 1} #define SOC_ENUM_SINGLE_VIRT(xitems, xtexts) \ SOC_ENUM_SINGLE(SND_SOC_NOPM, 0, xitems, xtexts) #define SOC_ENUM(xname, xenum) \ @@ -312,6 +316,11 @@ ARRAY_SIZE(xtexts), xtexts, xvalues) #define SOC_VALUE_ENUM_SINGLE_DECL(name, xreg, xshift, xmask, xtexts, xvalues) \ SOC_VALUE_ENUM_DOUBLE_DECL(name, xreg, xshift, xshift, xmask, xtexts, xvalues) + +#define SOC_VALUE_ENUM_SINGLE_AUTODISABLE_DECL(name, xreg, xshift, xmask, xtexts, xvalues) \ + const struct soc_enum name = SOC_VALUE_ENUM_SINGLE_AUTODISABLE(xreg, \ + xshift, xmask, ARRAY_SIZE(xtexts), xtexts, xvalues) + #define SOC_ENUM_SINGLE_VIRT_DECL(name, xtexts) \ const struct soc_enum name = SOC_ENUM_SINGLE_VIRT(ARRAY_SIZE(xtexts), xtexts)
@@ -1200,6 +1209,7 @@ struct soc_enum { unsigned int mask; const char * const *texts; const unsigned int *values; + unsigned int autodisable:1; };
/** diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index e557018..90c65bd 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -308,6 +308,7 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget, { struct dapm_kcontrol_data *data; struct soc_mixer_control *mc; + struct soc_enum *e; const char *name; int ret;
@@ -354,6 +355,34 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget, } } break; + case snd_soc_dapm_mux: + e = (struct soc_enum *)kcontrol->private_value; + + if (e->autodisable) { + struct snd_soc_dapm_widget template; + + memset(&template, 0, sizeof(template)); + template.reg = e->reg; + template.mask = e->mask << e->shift_l; + template.shift = e->shift_l; + template.off_val = 0; + template.on_val = template.off_val; + template.id = snd_soc_dapm_kcontrol; + template.name = name; + + data->value = template.on_val; + + data->widget = snd_soc_dapm_new_control(widget->dapm, + &template); + if (!data->widget) { + ret = -ENOMEM; + goto err_name; + } + + snd_soc_dapm_add_path(widget->dapm, data->widget, + widget, NULL, NULL); + } + break; default: break; } @@ -417,11 +446,6 @@ static void dapm_kcontrol_add_path(const struct snd_kcontrol *kcontrol, struct dapm_kcontrol_data *data = snd_kcontrol_chip(kcontrol);
list_add_tail(&path->list_kcontrol, &data->paths); - - if (data->widget) { - snd_soc_dapm_add_path(data->widget->dapm, data->widget, - path->source, NULL, NULL); - } }
static bool dapm_kcontrol_is_powered(const struct snd_kcontrol *kcontrol) @@ -819,6 +843,7 @@ static int dapm_new_mixer(struct snd_soc_dapm_widget *w) { int i, ret; struct snd_soc_dapm_path *path; + struct dapm_kcontrol_data *data;
/* add kcontrol */ for (i = 0; i < w->num_kcontrols; i++) { @@ -828,16 +853,20 @@ static int dapm_new_mixer(struct snd_soc_dapm_widget *w) if (path->name != (char *)w->kcontrol_news[i].name) continue;
- if (w->kcontrols[i]) { - dapm_kcontrol_add_path(w->kcontrols[i], path); - continue; + if (!w->kcontrols[i]) { + ret = dapm_create_or_share_mixmux_kcontrol(w, i); + if (ret < 0) + return ret; }
- ret = dapm_create_or_share_mixmux_kcontrol(w, i); - if (ret < 0) - return ret; - dapm_kcontrol_add_path(w->kcontrols[i], path); + + data = snd_kcontrol_chip(w->kcontrols[i]); + if (data->widget) + snd_soc_dapm_add_path(data->widget->dapm, + data->widget, + path->source, + NULL, NULL); } }
@@ -2944,16 +2973,19 @@ int snd_soc_dapm_get_enum_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kcontrol); + struct snd_soc_card *card = dapm->card; struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; unsigned int reg_val, val;
- if (e->reg != SND_SOC_NOPM) { + mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME); + if (e->reg != SND_SOC_NOPM && dapm_kcontrol_is_powered(kcontrol)) { int ret = soc_dapm_read(dapm, e->reg, ®_val); if (ret) return ret; } else { reg_val = dapm_kcontrol_get_value(kcontrol); } + mutex_unlock(&card->dapm_mutex);
val = (reg_val >> e->shift_l) & e->mask; ucontrol->value.enumerated.item[0] = snd_soc_enum_val_to_item(e, val); @@ -3002,10 +3034,10 @@ int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol,
mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
+ change = dapm_kcontrol_set_value(kcontrol, val); + if (e->reg != SND_SOC_NOPM) change = soc_dapm_test_bits(dapm, e->reg, mask, val); - else - change = dapm_kcontrol_set_value(kcontrol, val);
if (change) { if (e->reg != SND_SOC_NOPM) {
On 04/30/2015 12:38 PM, Charles Keepax wrote:
Commit 57295073b6ac ("ASoC: dapm: Implement mixer input auto-disable") added support for autodisable controls, controls whose values are only written to the hardware when their respective widgets are powered up. But it only added support for controls based on the mixer abstraction.
This patch add support for mux controls (DAPM controls based on the enum abstraction) to be auto-disabled as well. As each mux can only have a single control, there is no need to tie the autodisable widget to the inputs (as is done for the mixer controls) it can be tided directly to the mux widget itself.
Signed-off-by: Charles Keepax ckeepax@opensource.wolfsonmicro.com
Looks pretty good.
[...]
@@ -354,6 +355,34 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget, } } break;
- case snd_soc_dapm_mux:
e = (struct soc_enum *)kcontrol->private_value;if (e->autodisable) {struct snd_soc_dapm_widget template;memset(&template, 0, sizeof(template));template.reg = e->reg;template.mask = e->mask << e->shift_l;template.shift = e->shift_l;template.off_val = 0;
I've though about adding a auto-disable MUX type as well and the chip were I wanted to use it has a non-zero power-off value. So I'd like to be able to somehow specify this. We could for example put it at the end of the values array. E.g.
if (e->values) template.off_val = e->values[e->items]. else template.off_val = 0;
template.on_val = template.off_val;template.id = snd_soc_dapm_kcontrol;template.name = name;data->value = template.on_val;data->widget = snd_soc_dapm_new_control(widget->dapm,&template);if (!data->widget) {ret = -ENOMEM;goto err_name;}snd_soc_dapm_add_path(widget->dapm, data->widget,widget, NULL, NULL);}break;
On Thu, Apr 30, 2015 at 02:44:40PM +0200, Lars-Peter Clausen wrote:
On 04/30/2015 12:38 PM, Charles Keepax wrote:
Commit 57295073b6ac ("ASoC: dapm: Implement mixer input auto-disable") added support for autodisable controls, controls whose values are only written to the hardware when their respective widgets are powered up. But it only added support for controls based on the mixer abstraction.
This patch add support for mux controls (DAPM controls based on the enum abstraction) to be auto-disabled as well. As each mux can only have a single control, there is no need to tie the autodisable widget to the inputs (as is done for the mixer controls) it can be tided directly to the mux widget itself.
Signed-off-by: Charles Keepax ckeepax@opensource.wolfsonmicro.com
Looks pretty good.
[...]
@@ -354,6 +355,34 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget, } } break;
- case snd_soc_dapm_mux:
e = (struct soc_enum *)kcontrol->private_value;if (e->autodisable) {struct snd_soc_dapm_widget template;memset(&template, 0, sizeof(template));template.reg = e->reg;template.mask = e->mask << e->shift_l;template.shift = e->shift_l;template.off_val = 0;I've though about adding a auto-disable MUX type as well and the chip were I wanted to use it has a non-zero power-off value. So I'd like to be able to somehow specify this. We could for example put it at the end of the values array. E.g.
if (e->values) template.off_val = e->values[e->items]. else template.off_val = 0;
Thats a good point something I hadn't thought of. It seems reasonable that if the mux is autodisable that one of the states in the values array should be the disabled state. Either the first or last value would seem the reasonable choices. I would lean towards the first value, as this is already the case in the Arizona code :-).
I will do a respin with that included.
Thanks, Charles
On 04/30/2015 05:00 PM, Charles Keepax wrote:
On Thu, Apr 30, 2015 at 02:44:40PM +0200, Lars-Peter Clausen wrote:
On 04/30/2015 12:38 PM, Charles Keepax wrote:
Commit 57295073b6ac ("ASoC: dapm: Implement mixer input auto-disable") added support for autodisable controls, controls whose values are only written to the hardware when their respective widgets are powered up. But it only added support for controls based on the mixer abstraction.
This patch add support for mux controls (DAPM controls based on the enum abstraction) to be auto-disabled as well. As each mux can only have a single control, there is no need to tie the autodisable widget to the inputs (as is done for the mixer controls) it can be tided directly to the mux widget itself.
Signed-off-by: Charles Keepax ckeepax@opensource.wolfsonmicro.com
Looks pretty good.
[...]
@@ -354,6 +355,34 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget, } } break;
- case snd_soc_dapm_mux:
e = (struct soc_enum *)kcontrol->private_value;if (e->autodisable) {struct snd_soc_dapm_widget template;memset(&template, 0, sizeof(template));template.reg = e->reg;template.mask = e->mask << e->shift_l;template.shift = e->shift_l;template.off_val = 0;I've though about adding a auto-disable MUX type as well and the chip were I wanted to use it has a non-zero power-off value. So I'd like to be able to somehow specify this. We could for example put it at the end of the values array. E.g.
if (e->values) template.off_val = e->values[e->items]. else template.off_val = 0;
Thats a good point something I hadn't thought of. It seems reasonable that if the mux is autodisable that one of the states in the values array should be the disabled state. Either the first or last value would seem the reasonable choices. I would lean towards the first value, as this is already the case in the Arizona code :-).
Hm, right. What I had in mind is to not export the off state to userland, but I guess it makes sense to make it possible to select it explicitly since it is consistent with the auto-disable switches.
- Lars
On Thu, Apr 30, 2015 at 05:39:50PM +0200, Lars-Peter Clausen wrote:
Hm, right. What I had in mind is to not export the off state to userland, but I guess it makes sense to make it possible to select it explicitly since it is consistent with the auto-disable switches.
It's not just consistent, you need to be able to do that so that you can set something to a known unused input when it's not in use, otherwise you need to worry about making sure that you don't end up causing audio to flow through the mux unintentionally when you go into some other use case.
The mixer core on the Arizona devices is powered up whenever any routing is non-zero. This patch saves a little power and avoids a few difficult corner cases (around the mixer core being powered whilst there is no clock available), by using the autodisable mux functionality to only write out the settings for the muxes when they are powered up.
Signed-off-by: Charles Keepax ckeepax@opensource.wolfsonmicro.com --- sound/soc/codecs/arizona.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/arizona.h b/sound/soc/codecs/arizona.h index 11ff899..bacc296 100644 --- a/sound/soc/codecs/arizona.h +++ b/sound/soc/codecs/arizona.h @@ -107,8 +107,8 @@ extern int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS]; arizona_mixer_tlv)
#define ARIZONA_MUX_ENUM_DECL(name, reg) \ - SOC_VALUE_ENUM_SINGLE_DECL(name, reg, 0, 0xff, \ - arizona_mixer_texts, arizona_mixer_values) + SOC_VALUE_ENUM_SINGLE_AUTODISABLE_DECL( \ + name, reg, 0, 0xff, arizona_mixer_texts, arizona_mixer_values)
#define ARIZONA_MUX_CTL_DECL(name) \ const struct snd_kcontrol_new name##_mux = \
participants (3)
-
Charles Keepax -
Lars-Peter Clausen -
Mark Brown