Add a generic exception mechanism for mixer-control-names which don't use the standard suffixes from the suffixes table. And move the existing exceptions which consist of a simple !strcmp() check over to this new mechanism. This also fixes the "Capture Volume" and "Capture Switch" exceptions no longer working after commit 86b9c67774bc ("mixer: simple - Unify simple_none: base_len() exception handling") because they were moved to after the suffix checking, so they would be treated as CTL_GLOBAL_VOLUME resp. CTL_GLOBAL_SWITCH based on their suffix before the exception check has a chance to check for a match. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- src/mixer/simple_none.c | 48 +++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c index 71d88486..30d5aa8b 100644 --- a/src/mixer/simple_none.c +++ b/src/mixer/simple_none.c @@ -905,14 +905,41 @@ static const struct suf { {" Volume", CTL_GLOBAL_VOLUME}, {NULL, 0} }; + +static const struct excep { + const char *name; + int base_len; + selem_ctl_type_t type; +} exceptions[] = { + /* Special case - handle "Input Source" as a capture route. + * Note that it's *NO* capture source. A capture source is split over + * sub-elements, and multiple capture-sources will result in an error. + * That's why some drivers use "Input Source" as a workaround. + * Hence, this is a workaround for a workaround to get the things + * straight back again. Sigh. + */ + {"Input Source", 12, CTL_CAPTURE_ROUTE}, + /* Avoid these Capture Volume/Switch controls getting seen as GLOBAL VOL/SW */ + {"Capture Volume", 7, CTL_CAPTURE_VOLUME}, + {"Capture Switch", 7, CTL_CAPTURE_SWITCH}, + {NULL,} +}; #endif /* Return base length */ static int base_len(const char *name, selem_ctl_type_t *type) { + const struct excep *e; const struct suf *p; size_t nlen = strlen(name); + for (e = exceptions; e->name; e++) { + if (!strcmp(name, e->name)) { + *type = e->type; + return e->base_len; + } + } + for (p = suffixes; p->suffix; p++) { size_t slen = strlen(p->suffix); size_t l; @@ -926,27 +953,6 @@ static int base_len(const char *name, selem_ctl_type_t *type) } } - /* exception: "Capture Volume" and "Capture Switch" */ - if (!strcmp(name, "Capture Volume")) { - *type = CTL_CAPTURE_VOLUME; - return strlen("Capture"); - } - if (!strcmp(name, "Capture Switch")) { - *type = CTL_CAPTURE_SWITCH; - return strlen("Capture"); - } - - /* Special case - handle "Input Source" as a capture route. - * Note that it's *NO* capture source. A capture source is split over - * sub-elements, and multiple capture-sources will result in an error. - * That's why some drivers use "Input Source" as a workaround. - * Hence, this is a workaround for a workaround to get the things - * straight back again. Sigh. - */ - if (!strcmp(name, "Input Source")) { - *type = CTL_CAPTURE_ROUTE; - return strlen(name); - } if (strstr(name, "3D Control")) { if (strstr(name, "Depth")) { *type = CTL_PLAYBACK_VOLUME; -- 2.30.1

The following ASoC codec drivers: sound/soc/codecs/rt5640.c sound/soc/codecs/rt5645.c sound/soc/codecs/rt5651.c sound/soc/codecs/rt5677.c Use capture-volume-control names like: "IN1 Boost", note the missing " Volume" suffix. This causes the mixer code to not identify these as volume-controls, which causes some of the dB related sm_elem_ops to return -EINVAL. This in turn causes alsamixer to not show dB info and causes UCM profile HW volume control support in pulseaudio to not work properly due to the lacking dB scale info. This cannot be fixed on the kernel side because the non " Volume" suffixed names are used in UCM profiles currently shipping in alsa-ucm-conf. Add these to the exceptions table, so that these correctly get identified as CTL_CAPTURE_VOLUME controls. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- src/mixer/simple_none.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c index b29554cb..8f964959 100644 --- a/src/mixer/simple_none.c +++ b/src/mixer/simple_none.c @@ -926,6 +926,11 @@ static const struct excep { {"3D Control - Depth", 18, CTL_PLAYBACK_VOLUME}, {"3D Control Sigmatel - Depth", 27, CTL_PLAYBACK_VOLUME}, {"3D Control Sigmatel - Rear Depth", 32, CTL_PLAYBACK_VOLUME}, + /* Capture Volume/Switch controls without a " Capture ..." suffix */ + {"ADC Boost Gain", 14, CTL_CAPTURE_VOLUME}, + {"IN1 Boost", 9, CTL_CAPTURE_VOLUME}, + {"IN2 Boost", 9, CTL_CAPTURE_VOLUME}, + {"IN3 Boost", 9, CTL_CAPTURE_VOLUME}, {NULL,} }; #endif -- 2.30.1

The following ASoC codec drivers: sound/soc/codecs/rt5640.c sound/soc/codecs/rt5645.c Use the following troublesome playback-switch-control names: "Headphone Channel Switch" "HP Channel Switch" "Speaker Channel Switch" There are 2 problems with these names: 1. They are the mute controls for the matching: "Headphone Playback Volume" "HP Playback Volume" "Speaker Playback Volume" controls, to be properly paired, which is necessary for HW volume-control support, the simple mixer code needs to recognize that the base-name for these is e.g. "Headphone" not "Headphone Channel". 2. They are playback-switches, yet they get recognized as global-switches. Add these to the exceptions table so that they get the proper basename and type set. Note we can NOT fix this by adding " Channel Switch" as a suffix to the suffixes table, because the line-out output on these codecs has the following controls: "OUT Playback Switch" "OUT Channel Switch" "OUT Playback Volume" Where the 2 switches describe mutes in 2 different places in the graph. So if we were to add a " Channel Switch" suffix map to CTL_PLAYBACK_SWITCH then we would get 2 CTL_PLAYBACK_SWITCH controls for the "OUT" mixer element, which is not allowed. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- src/mixer/simple_none.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c index de81966f..d5025f68 100644 --- a/src/mixer/simple_none.c +++ b/src/mixer/simple_none.c @@ -933,6 +933,9 @@ static const struct excep { {"3D Control - Depth", 18, CTL_PLAYBACK_VOLUME}, {"3D Control Sigmatel - Depth", 27, CTL_PLAYBACK_VOLUME}, {"3D Control Sigmatel - Rear Depth", 32, CTL_PLAYBACK_VOLUME}, + {"Headphone Channel Switch", 9, CTL_PLAYBACK_SWITCH}, + {"HP Channel Switch", 2, CTL_PLAYBACK_SWITCH}, + {"Speaker Channel Switch", 7, CTL_PLAYBACK_SWITCH}, /* Capture Volume/Switch controls without a " Capture ..." suffix */ {"ADC Boost Gain", 14, CTL_CAPTURE_VOLUME}, {"IN1 Boost", 9, CTL_CAPTURE_VOLUME}, -- 2.30.1