ALSA: usb-audio: More workarounds for TRX40-mobos
cover ALSA: usb-audio: More workarounds for TRX40-mobos
Hi,
it turned out that the recent mobos shipped with Realtek codec need more workarounds. In the end, most of the fixes here are generic issues, hence marked for stable.
The bugtracker is at:
https://bugzilla.kernel.org/show_bug.cgi?id=206873
Takashi
===
Takashi Iwai (4):
ALSA: usb-audio: Filter error from connector kctl ops, too
ALSA: usb-audio: Don't override ignore_ctl_error value from the map
ALSA: usb-audio: Don't create jack controls for PCM terminals
ALSA: usb-audio: Check mapping at creating connector controls, too
sound/usb/mixer.c | 31 +++++++++++++++++++------------ sound/usb/mixer_maps.c | 4 +++- 2 files changed, 22 insertions(+), 13 deletions(-)
Signature · 1 line
2.16.4
PATCH 1/4 ALSA: usb-audio: Filter error from connector kctl ops, too
The ignore_ctl_error option should filter the error at kctl accesses, but there was an overlook: mixer_ctl_connector_get() returns an error from the request.
This patch covers the forgotten code path and apply filter_error() properly. The locking error is still returned since this is a fatal error that has to be reported even with ignore_ctl_error option.
--- sound/usb/mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/mixer.c +1 -1
@@ -1457,7 +1457,7 @@ static int mixer_ctl_connector_get(struct snd_kcontrol *kcontrol,usb_audio_err (chip,"cannot get connectors status: req = %#x, wValue = %#x, wIndex = %#x, type = %d\n" ,UAC_GET_CUR , validx, idx, cval->val_type); -return ret; +return filter_error (cval, ret); } ucontrol->value.integer.value[0 ] = val;
Signature · 1 line
2.16.4
PATCH 2/4 ALSA: usb-audio: Don't override ignore_ctl_error value from the map
In reply to Takashi IwaiThe mapping table may contain also ignore_ctl_error flag for devices that are known to behave wild. Since this flag always writes the card's own ignore_ctl_error flag, it overrides the value already set by the module option, so it doesn't follow user's expectation. Let's fix the code not to clear the flag that has been set by user.
--- sound/usb/mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/mixer.c +1 -1
@@ -3106,7 +3106,7 @@ static int snd_usb_mixer_controls(struct usb_mixer_interface *mixer)if (map->id == state.chip->usb_id) { state.map = map->map; state.selector_map = map->selector_map; - mixer->ignore_ctl_error = map->ignore_ctl_error; + mixer->ignore_ctl_error |= map->ignore_ctl_error;break ; } }
Signature · 1 line
2.16.4
PATCH 3/4 ALSA: usb-audio: Don't create jack controls for PCM terminals
In reply to Takashi IwaiSome funky firmwares set the connector flag even on PCM terminals although it doesn't make sense (and even actually the firmware doesn't react properly!). Let's skip creation of jack controls in such a case.
--- sound/usb/mixer.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
sound/usb/mixer.c +6 -3
@@ -2109,7 +2109,8 @@ static int parse_audio_input_terminal(struct mixer_build *state, int unitid,check_input_term (state, term_id, &iterm);/* Check for jack detection. */ -if (uac_v2v3_control_is_readable (bmctls, control)) +if ((iterm.type &0xff00 ) !=0x0100 && +uac_v2v3_control_is_readable (bmctls, control))build_connector_control (state->mixer, &iterm, true);return 0 ;
@@ -3149,7 +3150,8 @@ static int snd_usb_mixer_controls(struct usb_mixer_interface *mixer)if (err <0 && err != -EINVAL )return err; -if (uac_v2v3_control_is_readable (le16_to_cpu (desc->bmControls), +if ((state.oterm.type &0xff00 ) !=0x0100 && +uac_v2v3_control_is_readable (le16_to_cpu (desc->bmControls),UAC2_TE_CONNECTOR )) {build_connector_control (state.mixer, &state.oterm, false);
@@ -3174,7 +3176,8 @@ static int snd_usb_mixer_controls(struct usb_mixer_interface *mixer)if (err <0 && err != -EINVAL )return err; -if (uac_v2v3_control_is_readable (le32_to_cpu (desc->bmControls), +if ((state.oterm.type &0xff00 ) !=0x0100 && +uac_v2v3_control_is_readable (le32_to_cpu (desc->bmControls),UAC3_TE_INSERTION )) {build_connector_control (state.mixer, &state.oterm, false);
Signature · 1 line
2.16.4
PATCH 4/4 ALSA: usb-audio: Check mapping at creating connector controls, too
In reply to Takashi IwaiAdd the mapping check to build_connector_control() so that the device specific quirk can provide the node to skip for the badly behaving connector controls. As an example, ALC1220-VB-based codec implements the skip entry for the broken SPDIF connector detection.
--- sound/usb/mixer.c | 18 +++++++++++------- sound/usb/mixer_maps.c | 4 +++- 2 files changed, 14 insertions(+), 8 deletions(-)
sound/usb/mixer.c +11 -7
@@ -1771,11 +1771,15 @@ static void get_connector_control_name(struct usb_mixer_interface *mixer,/* Build a mixer control for a UAC connector control (jack-detect) */ static void build_connector_control (struct usb_mixer_interface *mixer, +const struct usbmix_name_map *imap,struct usb_audio_term *term,bool is_input) {struct snd_kcontrol *kctl;struct usb_mixer_elem_info *cval; +if (check_ignored_ctl (find_map (imap, term->id,0 ))) +return ; + cval =kzalloc (sizeof (*cval),GFP_KERNEL );if (!cval)return ;
@@ -2111,7 +2115,7 @@ static int parse_audio_input_terminal(struct mixer_build *state, int unitid,/* Check for jack detection. */ if ((iterm.type &0xff00 ) !=0x0100 &&uac_v2v3_control_is_readable (bmctls, control)) -build_connector_control (state->mixer, &iterm, true); +build_connector_control (state->mixer, state->map, &iterm, true);return 0 ; }
@@ -3072,13 +3076,13 @@ static int snd_usb_mixer_controls_badd(struct usb_mixer_interface *mixer,memset (&iterm,0 ,sizeof (iterm)); iterm.id =UAC3_BADD_IT_ID4 ; iterm.type =UAC_BIDIR_TERMINAL_HEADSET ; -build_connector_control (mixer, &iterm, true); +build_connector_control (mixer, map->map, &iterm, true);/* Output Term - Insertion control */ memset (&oterm,0 ,sizeof (oterm)); oterm.id =UAC3_BADD_OT_ID3 ; oterm.type =UAC_BIDIR_TERMINAL_HEADSET ; -build_connector_control (mixer, &oterm, false); +build_connector_control (mixer, map->map, &oterm, false); }return 0 ;
@@ -3153,8 +3157,8 @@ static int snd_usb_mixer_controls(struct usb_mixer_interface *mixer)if ((state.oterm.type &0xff00 ) !=0x0100 &&uac_v2v3_control_is_readable (le16_to_cpu (desc->bmControls),UAC2_TE_CONNECTOR )) { -build_connector_control (state.mixer, &state.oterm, - false); +build_connector_control (state.mixer, state.map, + &state.oterm, false); } }else {/* UAC_VERSION_3 */ struct uac3_output_terminal_descriptor *desc = p;
@@ -3179,8 +3183,8 @@ static int snd_usb_mixer_controls(struct usb_mixer_interface *mixer)if ((state.oterm.type &0xff00 ) !=0x0100 &&uac_v2v3_control_is_readable (le32_to_cpu (desc->bmControls),UAC3_TE_INSERTION )) { -build_connector_control (state.mixer, &state.oterm, - false); +build_connector_control (state.mixer, state.map, + &state.oterm, false); } } }
sound/usb/mixer_maps.c +3 -1
@@ -360,9 +360,11 @@ static const struct usbmix_name_map corsair_virtuoso_map[] = { };/* Some mobos shipped with a dummy HD-audio show the invalid GET_MIN/GET_MAX -* response for Input Gain Pad (id=19, control=12). Skip it. +* response for Input Gain Pad (id=19, control=12) and the connector status +* for SPDIF terminal (id=18). Skip them. */ static const struct usbmix_name_map asus_rog_map[] = { + {18 ,NULL },/* OT, connector control */ {19 ,NULL ,12 },/* FU, Input Gain Pad */ {} };
Signature · 1 line
2.16.4