Skip to contentSkip to conversation

ALSA: usb-audio: Fix regression with Dell Dock jack detection

PATCH In review Takashi Iwai 2 participants 7 messages Nov 2, 2022 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ALSA: usb-audio: Fix regression with Dell Dock jack detection

The recent commit added Jack controls to Dell Dock, but it added with iface = SNDRV_CTL_ELEM_IFACE_CARD. Unfortunately this doesn't match with the changes in user-space UCM profile, which expects iface = SNDRV_CTL_ELEM_IFACE_MIXER as default. This mismatch resulted in the non-working profile, and the Dell Dock is gone on pipewire / PulseAudio after the kernel update.

Fix the regression by adjusting the iface of the new ctl elements to *_MIXER.

Fixes 4b8ea38fabab ("ALSA: usb-audio: Support jack detection on Dell dock")
---
 sound/usb/mixer_quirks.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/mixer_quirks.c +1 -1
index ab0d459f4271..3039a17259ab 100644
@@ -2042,7 +2042,7 @@ static int realtek_ctl_connector_get(struct snd_kcontrol *kcontrol,
 }
 
 static const struct snd_kcontrol_new realtek_connector_ctl_ro = {
-	.iface = SNDRV_CTL_ELEM_IFACE_CARD,
+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
 	.name = "", /* will be filled later manually */
 	.access = SNDRV_CTL_ELEM_ACCESS_READ,
 	.info = snd_ctl_boolean_mono_info,
Signature · 1 line
2.35.3
maintainer
#1 lore raw
Quoted 9 lines · Takashi Iwai

The recent commit added Jack controls to Dell Dock, but it added with iface = SNDRV_CTL_ELEM_IFACE_CARD. Unfortunately this doesn't match with the changes in user-space UCM profile, which expects iface = SNDRV_CTL_ELEM_IFACE_MIXER as default. This mismatch resulted in the non-working profile, and the Dell Dock is gone on pipewire / PulseAudio after the kernel update.

Fix the regression by adjusting the iface of the new ctl elements to *_MIXER.

Hi Takashi,

UCM expects SNDRV_CTL_ELEM_IFACE_CARD for jacks by default. Which change do you refer? I would drop this patch.

Thanks,
Jaroslav

Signature · 2 lines
Jaroslav Kysela <[email protected]>
Linux Sound Maintainer; ALSA Project; Red Hat, Inc.
#2 lore raw
Quoted 9 lines · Jaroslav Kysela
Quoted 7 lines · Takashi Iwai

The recent commit added Jack controls to Dell Dock, but it added with iface = SNDRV_CTL_ELEM_IFACE_CARD. Unfortunately this doesn't match with the changes in user-space UCM profile, which expects iface = SNDRV_CTL_ELEM_IFACE_MIXER as default. This mismatch resulted in the non-working profile, and the Dell Dock is gone on pipewire / PulseAudio after the kernel update.

Quoted 7 lines
Quoted 2 lines

Fix the regression by adjusting the iface of the new ctl elements to *_MIXER.

Hi Takashi,

UCM expects SNDRV_CTL_ELEM_IFACE_CARD for jacks by default. Which change do you refer? I would drop this patch.

It's about ucm2/USB-Audio/Dell/WD15-Dock-HiFi.conf, the JackControl entries. For example,
JackControl "Headphone Jack"
expects the mixer element. The bad thing is that the complete card entry disappears because of inconsistency.
If you modify the entry as
JackControl "name='Headphone Jack',iface=CARD"
it would work. But the fact that other JackControl stuff works, it's better to align the USB-audio with IFACE_MIXER, I guess.

Takashi

#3 lore raw
Quoted 20 lines · Takashi Iwai
Quoted 9 lines · Jaroslav Kysela
Quoted 7 lines · Takashi Iwai

The recent commit added Jack controls to Dell Dock, but it added with iface = SNDRV_CTL_ELEM_IFACE_CARD. Unfortunately this doesn't match with the changes in user-space UCM profile, which expects iface = SNDRV_CTL_ELEM_IFACE_MIXER as default. This mismatch resulted in the non-working profile, and the Dell Dock is gone on pipewire / PulseAudio after the kernel update.

Quoted 7 lines
Quoted 2 lines

Fix the regression by adjusting the iface of the new ctl elements to *_MIXER.

Hi Takashi,

UCM expects SNDRV_CTL_ELEM_IFACE_CARD for jacks by default. Which change do you refer? I would drop this patch.

Quoted 9 lines

It's about ucm2/USB-Audio/Dell/WD15-Dock-HiFi.conf, the JackControl entries. For example,
JackControl "Headphone Jack"
expects the mixer element. The bad thing is that the complete card entry disappears because of inconsistency.
If you modify the entry as
JackControl "name='Headphone Jack',iface=CARD"
it would work. But the fact that other JackControl stuff works, it's better to align the USB-audio with IFACE_MIXER, I guess.

Hm, looking at the UCM code, UCM should treat IFACE_CARD as default, indeed. Something went south. Will take a deeper look.

Takashi

maintainer
#4 lore raw
Quoted 32 lines · Takashi Iwai
Quoted 20 lines · Takashi Iwai
Quoted 9 lines · Jaroslav Kysela
Quoted 7 lines · Takashi Iwai

The recent commit added Jack controls to Dell Dock, but it added with iface = SNDRV_CTL_ELEM_IFACE_CARD. Unfortunately this doesn't match with the changes in user-space UCM profile, which expects iface = SNDRV_CTL_ELEM_IFACE_MIXER as default. This mismatch resulted in the non-working profile, and the Dell Dock is gone on pipewire / PulseAudio after the kernel update.

Quoted 7 lines
Quoted 2 lines

Fix the regression by adjusting the iface of the new ctl elements to *_MIXER.

Hi Takashi,

UCM expects SNDRV_CTL_ELEM_IFACE_CARD for jacks by default. Which change do you refer? I would drop this patch.

Quoted 9 lines

It's about ucm2/USB-Audio/Dell/WD15-Dock-HiFi.conf, the JackControl entries. For example,
JackControl "Headphone Jack"
expects the mixer element. The bad thing is that the complete card entry disappears because of inconsistency.
If you modify the entry as
JackControl "name='Headphone Jack',iface=CARD"
it would work. But the fact that other JackControl stuff works, it's better to align the USB-audio with IFACE_MIXER, I guess.

Quoted 2 lines

Hm, looking at the UCM code, UCM should treat IFACE_CARD as default, indeed. Something went south. Will take a deeper look.

Perhaps, it's this issue - https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2744 . The configuration for the Dell's docking station has also defined all jacks. If only an output equipment is connected, the pipewire may set the profile as not available. My fix (MR1429) should work. No idea why this issue is not visible in PA.

From alsa-info (from the OpenSuse bug), jack states:

name 'Line Out Jack' value true
name 'Headphone Jack' value false
name 'Headset Mic Jack' value false

Jaroslav

Signature · 2 lines
Jaroslav Kysela <[email protected]>
Linux Sound Maintainer; ALSA Project; Red Hat, Inc.
#5 lore raw
Quoted 37 lines · Jaroslav Kysela
Quoted 32 lines · Takashi Iwai
Quoted 20 lines · Takashi Iwai
Quoted 9 lines · Jaroslav Kysela
Quoted 7 lines · Takashi Iwai

The recent commit added Jack controls to Dell Dock, but it added with iface = SNDRV_CTL_ELEM_IFACE_CARD. Unfortunately this doesn't match with the changes in user-space UCM profile, which expects iface = SNDRV_CTL_ELEM_IFACE_MIXER as default. This mismatch resulted in the non-working profile, and the Dell Dock is gone on pipewire / PulseAudio after the kernel update.

Quoted 7 lines
Quoted 2 lines

Fix the regression by adjusting the iface of the new ctl elements to *_MIXER.

Hi Takashi,

UCM expects SNDRV_CTL_ELEM_IFACE_CARD for jacks by default. Which change do you refer? I would drop this patch.

Quoted 9 lines

It's about ucm2/USB-Audio/Dell/WD15-Dock-HiFi.conf, the JackControl entries. For example,
JackControl "Headphone Jack"
expects the mixer element. The bad thing is that the complete card entry disappears because of inconsistency.
If you modify the entry as
JackControl "name='Headphone Jack',iface=CARD"
it would work. But the fact that other JackControl stuff works, it's better to align the USB-audio with IFACE_MIXER, I guess.

Quoted 2 lines

Hm, looking at the UCM code, UCM should treat IFACE_CARD as default, indeed. Something went south. Will take a deeper look.

Quoted 6 lines

Perhaps, it's this issue -
https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2744 . The configuration for the Dell's docking station has also defined all jacks. If only an output equipment is connected, the pipewire may set the profile as not available. My fix (MR1429) should work. No idea why this issue is not visible in PA.

Yeah, I guess you're right, it's an issue in pipewire. Let's scratch my previous patch.

My bogus fix in the kernel looked as if working just because it made the jack unmatching (again), hence it skips the bug of pipewire.

BTW, while looking at this bug, I noticed another bug in alsa-lib src/ucm/main.c. The check in snd_use_case_parse_ctl_elem_id() should be rather to the value, not the identifier:

src/ucm/main.c +1 -1
@@ -2793,7 +2793,7 @@ int snd_use_case_parse_ctl_elem_id(snd_ctl_elem_id_t *dst,
 	    strcmp(ucm_id, "CaptureSwitch"))
 		return -EINVAL;
 	snd_ctl_elem_id_clear(dst);
-	if (strcasestr(ucm_id, "name="))
+	if (strcasestr(value, "name="))
 		return __snd_ctl_ascii_elem_id_parse(dst, value, NULL);
 	iface = SND_CTL_ELEM_IFACE_MIXER;
 	if (jack_control)

Takashi

maintainer
#6 lore raw
Quoted 7 lines · Takashi Iwai

BTW, while looking at this bug, I noticed another bug in alsa-lib src/ucm/main.c. The check in snd_use_case_parse_ctl_elem_id() should be rather to the value, not the identifier:

src/ucm/main.c int snd_use_case_parse_ctl_elem_id(snd_ctl_elem_id_t *dst, · line 2799

Quoted 8 lines
src/ucm/main.c +1 -1
@@ -2793,7 +2793,7 @@ int snd_use_case_parse_ctl_elem_id(snd_ctl_elem_id_t *dst,
  	    strcmp(ucm_id, "CaptureSwitch"))
  		return -EINVAL;
  	snd_ctl_elem_id_clear(dst);
-	if (strcasestr(ucm_id, "name="))
+	if (strcasestr(value, "name="))
  		return __snd_ctl_ascii_elem_id_parse(dst, value, NULL);
  	iface = SND_CTL_ELEM_IFACE_MIXER;
  	if (jack_control)

Oops. Thanks, it looks like an obvious thinko. Fixed right now.

Jaroslav

Signature · 2 lines
Jaroslav Kysela <[email protected]>
Linux Sound Maintainer; ALSA Project; Red Hat, Inc.