Commit fd9db105 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: usb-audio: Re-apply implicit feedback mode to Pioneer devices

Pioneer devices are supposed to be working with the implicit feedback
mode, but so far the attempt to apply the implicit feedback caused
issues, hence we explicitly skipped the implicit feedback mode for
them.  Recently, Geraldo discovered that the device actually works if
you skip the generic matching of the sync EPs for the capture stream.
That is, we should apply the implicit feedback setup for the playback
like other similar devices, while we need to return 1 from
audioformat_capture_quirk() so that no further matching will be done.

And, later on, Olivia reported later that the fiddling with the
capture quirk alone doesn't suffice for the test with speaker-test
program.  This seems to be a similar case like the recently fixed BOSS
devices.  Indeed, the problem could be addressed by setting
playback_first flag, which indicates that the playback URBs have to be
sent out at first even in the implicit feedback mode.

This patch implements the application of the implicit feedback to
Pioneer devices as described in the above.  The former
skip_pioneer_sync_ep() was dropped, and instead we provide
is_pioneer_implicit_fb() to check the Pioneer devices that need the
implicit feedback.  In the audioformat_implicit_fb_quirk(), simply
apply the implicit fb for playback and set chip->playback_first flag
if matching, and in audioformat_capture_quirk()(), it returns 1 for
skipping the generic EP sync handling.
Reported-by: default avatarGeraldo <geraldogabriel@gmail.com>
Tested-by: default avatarOlivia Mackintosh <livvy@base.nu>
Link: https://lore.kernel.org/r/s5ha6pygqfz.wl-tiwai@suse.de
Link: https://lore.kernel.org/r/20210419153918.450-1-tiwai@suse.deSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent e7df7df5
...@@ -230,18 +230,27 @@ static int add_roland_implicit_fb(struct snd_usb_audio *chip, ...@@ -230,18 +230,27 @@ static int add_roland_implicit_fb(struct snd_usb_audio *chip,
ifnum, alts); ifnum, alts);
} }
/* Playback and capture EPs on Pioneer devices share the same iface/altset, /* Playback and capture EPs on Pioneer devices share the same iface/altset
* but they don't seem working with the implicit fb mode well, hence we * for the implicit feedback operation
* just return as if the sync were already set up.
*/ */
static int skip_pioneer_sync_ep(struct snd_usb_audio *chip, static bool is_pioneer_implicit_fb(struct snd_usb_audio *chip,
struct audioformat *fmt, struct usb_host_interface *alts)
struct usb_host_interface *alts)
{ {
struct usb_endpoint_descriptor *epd; struct usb_endpoint_descriptor *epd;
if (USB_ID_VENDOR(chip->usb_id) != 0x2b73 &&
USB_ID_VENDOR(chip->usb_id) != 0x08e4)
return false;
if (alts->desc.bInterfaceClass != USB_CLASS_VENDOR_SPEC)
return false;
if (alts->desc.bNumEndpoints != 2) if (alts->desc.bNumEndpoints != 2)
return 0; return false;
epd = get_endpoint(alts, 0);
if (!usb_endpoint_is_isoc_out(epd) ||
(epd->bmAttributes & USB_ENDPOINT_SYNCTYPE) != USB_ENDPOINT_SYNC_ASYNC)
return false;
epd = get_endpoint(alts, 1); epd = get_endpoint(alts, 1);
if (!usb_endpoint_is_isoc_in(epd) || if (!usb_endpoint_is_isoc_in(epd) ||
...@@ -250,8 +259,9 @@ static int skip_pioneer_sync_ep(struct snd_usb_audio *chip, ...@@ -250,8 +259,9 @@ static int skip_pioneer_sync_ep(struct snd_usb_audio *chip,
USB_ENDPOINT_USAGE_DATA && USB_ENDPOINT_USAGE_DATA &&
(epd->bmAttributes & USB_ENDPOINT_USAGE_MASK) != (epd->bmAttributes & USB_ENDPOINT_USAGE_MASK) !=
USB_ENDPOINT_USAGE_IMPLICIT_FB)) USB_ENDPOINT_USAGE_IMPLICIT_FB))
return 0; return false;
return 1; /* don't handle with the implicit fb, just skip sync EP */
return true;
} }
static int __add_generic_implicit_fb(struct snd_usb_audio *chip, static int __add_generic_implicit_fb(struct snd_usb_audio *chip,
...@@ -367,12 +377,12 @@ static int audioformat_implicit_fb_quirk(struct snd_usb_audio *chip, ...@@ -367,12 +377,12 @@ static int audioformat_implicit_fb_quirk(struct snd_usb_audio *chip,
} }
/* Pioneer devices with vendor spec class */ /* Pioneer devices with vendor spec class */
if (attr == USB_ENDPOINT_SYNC_ASYNC && if (is_pioneer_implicit_fb(chip, alts)) {
alts->desc.bInterfaceClass == USB_CLASS_VENDOR_SPEC && chip->playback_first = 1;
(USB_ID_VENDOR(chip->usb_id) == 0x2b73 || /* Pioneer */ return add_implicit_fb_sync_ep(chip, fmt,
USB_ID_VENDOR(chip->usb_id) == 0x08e4 /* Pioneer */)) { get_endpoint(alts, 1)->bEndpointAddress,
if (skip_pioneer_sync_ep(chip, fmt, alts)) 1, alts->desc.bInterfaceNumber,
return 1; alts);
} }
/* Try the generic implicit fb if available */ /* Try the generic implicit fb if available */
...@@ -394,6 +404,8 @@ static int audioformat_capture_quirk(struct snd_usb_audio *chip, ...@@ -394,6 +404,8 @@ static int audioformat_capture_quirk(struct snd_usb_audio *chip,
if (p && (p->type == IMPLICIT_FB_FIXED || p->type == IMPLICIT_FB_BOTH)) if (p && (p->type == IMPLICIT_FB_FIXED || p->type == IMPLICIT_FB_BOTH))
return add_implicit_fb_sync_ep(chip, fmt, p->ep_num, 0, return add_implicit_fb_sync_ep(chip, fmt, p->ep_num, 0,
p->iface, NULL); p->iface, NULL);
if (is_pioneer_implicit_fb(chip, alts))
return 1; /* skip the quirk, also don't handle generic sync EP */
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment