Felix Homann wrote:

Am 07.07.2010 14:44, schrieb Clemens Ladisch:

...

(I have the suspicion that we don't actually need a AUDIO_FIXED_ENDPOINT quirk for these devices.)

Something must be in this AUDIO_FIXED_ENDPOINT quirk, since the device now works properly and stable @44.1/88.2 kHz. I don't know the exact reason, since I really don't understand all this stuff.

There must be some difference, and I'd really like to know what it is. Please load the driver with the patch below, with and without the AUDIO_FIXED_ENDPOINT patch, and show what it prints to the system log.

Regards, Clemens

--- a/sound/usb/format.c +++ b/sound/usb/format.c @@ -196,6 +196,7 @@ static int parse_audio_format_rates_v1(struct snd_usb_audio *chip, struct audiof hwc_debug("All rates were zero. Skipping format!\n"); return -1; } + print_hex_dump_bytes("rates ", DUMP_PREFIX_OFFSET, fp->rates, sizeof(int) * nr_rates); } else { /* continuous rates */ fp->rates = SNDRV_PCM_RATE_CONTINUOUS; @@ -480,6 +481,7 @@ int snd_usb_parse_audio_format(struct snd_usb_audio *chip, struct audioformat *f fp->fmt_type = fmt->bFormatType; if (err < 0) return err; + print_hex_dump_bytes("format ", DUMP_PREFIX_OFFSET, fp, sizeof(*fp)); #if 1 /* FIXME: temporary hack for extigy/audigy 2 nx/zs */ /* extigy apparently supports sample rates other than 48k diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 9a9da09..6be2bfc 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -142,6 +142,7 @@ static int create_fixed_stream_quirk(struct snd_usb_audio *chip, } memcpy(rate_table, fp->rate_table, sizeof(int) * fp->nr_rates); fp->rate_table = rate_table; + print_hex_dump_bytes("rates ", DUMP_PREFIX_OFFSET, fp->rate_table, sizeof(int) * fp->nr_rates); }

stream = (fp->endpoint & USB_DIR_IN) @@ -161,6 +162,7 @@ static int create_fixed_stream_quirk(struct snd_usb_audio *chip, alts = &iface->altsetting[fp->altset_idx]; fp->datainterval = snd_usb_parse_datainterval(chip, alts); fp->maxpacksize = le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize); + print_hex_dump_bytes("format ", DUMP_PREFIX_OFFSET, fp, sizeof(*fp)); usb_set_interface(chip->dev, fp->iface, 0); snd_usb_init_pitch(chip, fp->iface, alts, fp); snd_usb_init_sample_rate(chip, fp->iface, alts, fp, fp->rate_max);

Felix Homann wrote:

Building Alsa fails after applying your patch:

patching file quirks.c Hunk #2 FAILED at 159.

My patch was against the kernel source; the alsa-driver package needs this additional patch:

--- alsa-driver/usb/quirks.patch +++ alsa-driver/usb/quirks.patch @@ -15,9 +15,9 @@ +#else + fp->maxpacksize = get_endpoint(alts, 0)->wMaxPacketSize; +#endif + print_hex_dump_bytes("format ", DUMP_PREFIX_OFFSET, fp, sizeof(*fp)); usb_set_interface(chip->dev, fp->iface, 0); snd_usb_init_pitch(chip, fp->iface, alts, fp); - snd_usb_init_sample_rate(chip, fp->iface, alts, fp, fp->rate_max); @@ -228,7 +234,11 @@ fp->endpoint = get_endpoint(alts, 0)->bEndpointAddress; fp->ep_attr = get_endpoint(alts, 0)->bmAttributes;

At Wed, 01 Sep 2010 10:48:54 +0200, Felix Homann wrote:

Hi,

This is my second try to get support for all supported sample rates for the Fast Track Ultra (FTU) series into mainline alsa.

For clarification: Current Alsa already recognizes the supported sample rates. But it will sound very corrupted at 44.1000 Hz and 88.200 Hz. Without this patch your system will even probably freeze eventually when using the FTU at 44.100/88.200 Hz too long.

So the key idea in this patch is not to get 44.1 kHz and 88.2 kHz listed as supported sample rates (as they already are recognized) but to change the endpoint attributes.

Citing dhubsith on the M-Audio forum:

" The problem with using QUIRK_AUDIO_STANDARD_INTERFACE rather than QUIRK_AUDIO_FIXED_ENDPOINT is that ep_attr does not get set correctly. The device default for synchronization is async (0x05) for both capture and playback, but in fact it should be set to adaptive (0x09) on playback, so that playback follows capture, this way you don't get capture and playback using different sample rates.

Also, the Interface Class protocol for the device defaults to Vendor Specific Class, but the driver only recognizes Class 1 or 2. The device is really Class 1, so we have to force it to reflect this. There are 4 places that we need to set this."

The patch has been discussed starting here:

http://forums.m-audio.com/showthread.php?714-Not-a-problem.-FastTrack-on-lin...

The "key" has been found by dhubsith. Please read posts #79, #81, #84, #87, #97.

In post #102 of that forum you can even find an alternate patch by dhubsith which doesn't use a fixed endpoint quirk but sets

  protocol = UAC_VERSION_1;

for the FTU devices in sound/usb/format .c. You might even consider that patch. (I've resend it to alsa-devel yesterday).

After all, either one of the above mentioned patches should go into alsa, as right now we can't use the FTU devices at 44.1 and 88.2 kHz.

Thanks for the patch (and reposting it).

I myself find it's OK to apply since it's pretty local change. Clemens, what was your objection at that time?

thanks,

Takashi

Kind regards,

Felix

[2 0001-fix-sample-rates-ftu-v3.patch <text/x-patch (7bit)>]

...

From 1573e7e973e6adcfe39fbfdaae0be2d1a5e01501 Mon Sep 17 00:00:00 2001

From: Felix Homann fexpop@web.de Date: Wed, 7 Jul 2010 15:51:58 +0200 Subject: [PATCH - Fix Fast Track Ultra series 1/1] Fix 44.1/88.1 kHz 1/Fix playback/capture issues and related chrashes at 44100 Hz and 88200 Hz for M-Audio Fast Track Ultra series.

Signed-off-by: Felix Homann fexpop@web.de

diff --git a/usb/endpoint.c b/usb/endpoint.c index 1a701f1..bb9f938 100644 --- a/usb/endpoint.c +++ b/usb/endpoint.c @@ -404,8 +404,6 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no) break; case USB_ID(0x041e, 0x3020): /* Creative SB Audigy 2 NX */ case USB_ID(0x0763, 0x2003): /* M-Audio Audiophile USB */

• case USB_ID(0x0763, 0x2080): /* M-Audio Fast Track Ultra 8 */
  

• case USB_ID(0x0763, 0x2081): /* M-Audio Fast Track Ultra 8R */
  /* doesn't set the sample rate attribute, but supports it */
  fp->attributes |= UAC_EP_CS_ATTR_SAMPLE_RATE;
  break;
  

diff --git a/usb/quirks-table.h b/usb/quirks-table.h index f8797f6..4c1dc12 100644 --- a/usb/quirks-table.h +++ b/usb/quirks-table.h @@ -1827,10 +1827,10 @@ YAMAHA_DEVICE(0x7010, "UB99"), } }, {

• USB_DEVICE(0x0763, 0x2080),
• .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {

• USB_DEVICE(0x0763, 0x2080),
  

• .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
  

  /* .vendor_name = "M-Audio", */

• /* .product_name = "Fast Track Ultra 8", */
  

• /* .product_name = "Fast Track Ultra", */
  

  .ifnum = QUIRK_ANY_INTERFACE, .type = QUIRK_COMPOSITE, .data = & (const struct snd_usb_audio_quirk[]) {

@@ -1840,11 +1840,51 @@ YAMAHA_DEVICE(0x7010, "UB99"), }, { .ifnum = 1,

• 		.type = QUIRK_AUDIO_STANDARD_INTERFACE
  

• 		.type = QUIRK_AUDIO_FIXED_ENDPOINT,
  

• 		.data = & (const struct audioformat) {
  

• 			.formats = SNDRV_PCM_FMTBIT_S24_3LE,
  

• 			.channels = 8,
  

• 			.iface = 1,
  

• 			.altsetting = 1,
  

• 			.altset_idx = 1,
  

• 			.attributes = UAC_EP_CS_ATTR_SAMPLE_RATE,
  

• 			.endpoint = 0x01,
  

• 			.ep_attr = 0x09,
  

• 			.rates = SNDRV_PCM_RATE_44100 |
  

• 				SNDRV_PCM_RATE_48000 |
  

• 				SNDRV_PCM_RATE_88200 |
  

• 				SNDRV_PCM_RATE_96000,
  

• 			.rate_min = 44100,
  

• 			.rate_max = 96000,
  

• 			.nr_rates = 4,
  

• 			.rate_table = (unsigned int[]) {
  

• 				44100, 48000, 88200, 96000
  

• 			}
  

• 		}
  },
  {
  	.ifnum = 2,
  

• 		.type = QUIRK_AUDIO_STANDARD_INTERFACE
  

• 		.type = QUIRK_AUDIO_FIXED_ENDPOINT,
  

• 		.data = & (const struct audioformat) {
  

• 			.formats = SNDRV_PCM_FMTBIT_S24_3LE,
  

• 			.channels = 8,
  

• 			.iface = 2,
  

• 			.altsetting = 1,
  

• 			.altset_idx = 1,
  

• 			.attributes = UAC_EP_CS_ATTR_SAMPLE_RATE,
  

• 			.endpoint = 0x81,
  

• 			.ep_attr = 0x05,
  

• 			.rates = SNDRV_PCM_RATE_44100 |
  

• 				SNDRV_PCM_RATE_48000 |
  

• 				SNDRV_PCM_RATE_88200 |
  

• 				SNDRV_PCM_RATE_96000,
  

• 			.rate_min = 44100,
  

• 			.rate_max = 96000,
  

• 			.nr_rates = 4,
  

• 			.rate_table = (unsigned int[]) {
  

• 				44100, 48000, 88200, 96000
  

• 			}
  

• 		}
  },
  /* interface 3 (MIDI) is standard compliant */
  {
  

@@ -1855,7 +1895,7 @@ YAMAHA_DEVICE(0x7010, "UB99"), }, { USB_DEVICE(0x0763, 0x2081),

• .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {

• .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
  

  /* .vendor_name = "M-Audio", */ /* .product_name = "Fast Track Ultra 8R", */ .ifnum = QUIRK_ANY_INTERFACE,

@@ -1867,11 +1907,51 @@ YAMAHA_DEVICE(0x7010, "UB99"), }, { .ifnum = 1,

• 		.type = QUIRK_AUDIO_STANDARD_INTERFACE
  

• 		.type = QUIRK_AUDIO_FIXED_ENDPOINT,
  

• 		.data = & (const struct audioformat) {
  

• 			.formats = SNDRV_PCM_FMTBIT_S24_3LE,
  

• 			.channels = 8,
  

• 			.iface = 1,
  

• 			.altsetting = 1,
  

• 			.altset_idx = 1,
  

• 			.attributes = UAC_EP_CS_ATTR_SAMPLE_RATE,
  

• 			.endpoint = 0x01,
  

• 			.ep_attr = 0x09,
  

• 			.rates = SNDRV_PCM_RATE_44100 |
  

• 				SNDRV_PCM_RATE_48000 |
  

• 				SNDRV_PCM_RATE_88200 |
  

• 				SNDRV_PCM_RATE_96000,
  

• 			.rate_min = 44100,
  

• 			.rate_max = 96000,
  

• 			.nr_rates = 4,
  

• 			.rate_table = (unsigned int[]) {
  

• 					44100, 48000, 88200, 96000
  

• 			}
  

• 		}
  },
  {
  	.ifnum = 2,
  

• 		.type = QUIRK_AUDIO_STANDARD_INTERFACE
  

• 		.type = QUIRK_AUDIO_FIXED_ENDPOINT,
  

• 		.data = & (const struct audioformat) {
  

• 			.formats = SNDRV_PCM_FMTBIT_S24_3LE,
  

• 			.channels = 8,
  

• 			.iface = 2,
  

• 			.altsetting = 1,
  

• 			.altset_idx = 1,
  

• 			.attributes = UAC_EP_CS_ATTR_SAMPLE_RATE,
  

• 			.endpoint = 0x81,
  

• 			.ep_attr = 0x05,
  

• 			.rates = SNDRV_PCM_RATE_44100 |
  

• 				SNDRV_PCM_RATE_48000 |
  

• 				SNDRV_PCM_RATE_88200 |
  

• 				SNDRV_PCM_RATE_96000,
  

• 			.rate_min = 44100,
  

• 			.rate_max = 96000,
  

• 			.nr_rates = 4,
  

• 			.rate_table = (unsigned int[]) {
  

• 				44100, 48000, 88200, 96000
  

• 			}
  

• 		}
  },
  /* interface 3 (MIDI) is standard compliant */
  {
  

-- 1.7.1

On Thu, Sep 02, 2010 at 01:13:48PM +0200, Clemens Ladisch wrote:

Daniel Mack wrote:

...

On Thu, Sep 02, 2010 at 11:12:59AM +0200, Clemens Ladisch wrote:

...

...

...

Also, the Interface Class protocol for the device defaults to Vendor Specific Class, but the driver only recognizes Class 1 or 2. The device is really Class 1, so we have to force it to reflect this. There are 4 places that we need to set this."

Daniel, this seems to be a regression introduced with the UAC2 changes. The old driver accepted vendor-specific interfaces, if some quirk forced it to look at them.

Hmm, I don't follow. What's the problem, and why should that be caused by the UAC2 changes? Sorry, but I seem to have missed that thread.

I've got several reports that devices no longer work since UAC2 support got added. But I've just noticed this is not related to the interface class but to the interface protocol: the new code added checks for UAC_VERSION_1 or _2, but real devices apparently write just random junk into this field. (For vendor-specific interfaces, they are actually justified to do so.)

Grr. So what about cases where this "random junk" is 0x20 by coincidence?

We need something like the following (untested), unless you have a better idea:

We could also fix up such devices with quirks tables, but your approach is probably better as it catches all devices right away.

Thanks, Daniel

diff --git a/sound/usb/card.c b/sound/usb/card.c index 9feb00c..d5141a1 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -216,6 +216,10 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif) }

switch (protocol) {

• default:

• snd_printdd(KERN_WARN "unknown interface protocol %#02x, assuming v1\n");
  

• /* fall through */
  

• case UAC_VERSION_1: { struct uac1_ac_header_descriptor *h1 = control_header;

@@ -253,10 +257,6 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)

break;

}

• default:

• snd_printk(KERN_ERR "unknown protocol version 0x%02x\n", protocol);
  

• return -EINVAL;
  

  }

  return 0;

diff --git a/sound/usb/clock.c b/sound/usb/clock.c index b853f8d..7754a10 100644 --- a/sound/usb/clock.c +++ b/sound/usb/clock.c @@ -295,12 +295,11 @@ int snd_usb_init_sample_rate(struct snd_usb_audio *chip, int iface,

switch (altsd->bInterfaceProtocol) { case UAC_VERSION_1:

• default: return set_sample_rate_v1(chip, iface, alts, fmt, rate);

  case UAC_VERSION_2: return set_sample_rate_v2(chip, iface, alts, fmt, rate); }

• return -EINVAL;

}

diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index bb9f938..22589b5 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -275,6 +275,12 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no)

/* get audio formats */
switch (protocol) {

• default:
  

• 	snd_printdd(KERN_WARN "%d:%u:%d: unknown interface protocol %#02x, assuming v1\n",
  

• 		    dev->devnum, iface_no, altno, protocol);
  

• 	protocol = UAC_VERSION_1;
  

• 	/* fall through */
  

• case UAC_VERSION_1: { struct uac1_as_header_descriptor *as = snd_usb_find_csint_desc(alts->extra, alts->extralen, NULL, UAC_AS_GENERAL);

@@ -336,11 +342,6 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no) dev->devnum, iface_no, altno, as->bTerminalLink); continue; }

• default:
  

• 	snd_printk(KERN_ERR "%d:%u:%d : unknown interface protocol %04x\n",
  

• 		   dev->devnum, iface_no, altno, protocol);
  

• 	continue;
  

  }

  /* get format type */

diff --git a/sound/usb/format.c b/sound/usb/format.c index 4387f54..2ec73dd 100644 --- a/sound/usb/format.c +++ b/sound/usb/format.c @@ -49,7 +49,8 @@ static u64 parse_audio_format_i_type(struct snd_usb_audio *chip, u64 pcm_formats;

switch (protocol) {

• case UAC_VERSION_1: {

• case UAC_VERSION_1:
• default: { struct uac_format_type_i_discrete_descriptor *fmt = _fmt; sample_width = fmt->bBitResolution; sample_bytes = fmt->bSubframeSize;

@@ -64,9 +65,6 @@ static u64 parse_audio_format_i_type(struct snd_usb_audio *chip, format <<= 1; break; }

• default:

• return -EINVAL;
  

  }

  pcm_formats = 0;

@@ -385,6 +383,7 @@ static int parse_audio_format_i(struct snd_usb_audio *chip, */ switch (protocol) { case UAC_VERSION_1:

• default: fp->channels = fmt->bNrChannels; ret = parse_audio_format_rates_v1(chip, fp, (unsigned char *) fmt, 7); break;

@@ -434,7 +433,8 @@ static int parse_audio_format_ii(struct snd_usb_audio *chip, fp->channels = 1;

switch (protocol) {

• case UAC_VERSION_1: {

• case UAC_VERSION_1:
• default: { struct uac_format_type_ii_discrete_descriptor *fmt = _fmt; brate = le16_to_cpu(fmt->wMaxBitRate); framesize = le16_to_cpu(fmt->wSamplesPerFrame);

diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index c166db0..0478fa3 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -365,7 +365,7 @@ static int get_ctl_value_v2(struct usb_mixer_elem_info *cval, int request, int v

static int get_ctl_value(struct usb_mixer_elem_info *cval, int request, int validx, int *value_ret) {

• return (cval->mixer->protocol == UAC_VERSION_1) ?

• return (cval->mixer->protocol != UAC_VERSION_2) ? get_ctl_value_v1(cval, request, validx, value_ret) : get_ctl_value_v2(cval, request, validx, value_ret);

} @@ -415,7 +415,7 @@ int snd_usb_mixer_set_ctl_value(struct usb_mixer_elem_info *cval, unsigned char buf[2]; int val_len, timeout = 10;

• if (cval->mixer->protocol == UAC_VERSION_1) {

• if (cval->mixer->protocol != UAC_VERSION_2) { val_len = cval->val_type >= USB_MIXER_S16 ? 2 : 1; } else { /* UAC_VERSION_2 */ /* audio class v2 controls are always 2 bytes in size */

@@ -642,7 +642,7 @@ static int check_input_term(struct mixer_build *state, int id, struct usb_audio_ term->id = id; switch (hdr[2]) { case UAC_INPUT_TERMINAL:

• 	if (state->mixer->protocol == UAC_VERSION_1) {
  

• 	if (state->mixer->protocol != UAC_VERSION_2) {
  	struct uac_input_terminal_descriptor *d = p1;
  	term->type = le16_to_cpu(d->wTerminalType);
  	term->channels = d->bNrChannels;
  

@@ -1159,7 +1159,7 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void struct uac_feature_unit_descriptor *hdr = _ftr; __u8 *bmaControls;

• if (state->mixer->protocol == UAC_VERSION_1) {

• if (state->mixer->protocol != UAC_VERSION_2) { csize = hdr->bControlSize; channels = (hdr->bLength - 7) / csize - 1; bmaControls = hdr->bmaControls;

@@ -1198,7 +1198,7 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void else first_ch_bits = 0;

• if (state->mixer->protocol == UAC_VERSION_1) {

• if (state->mixer->protocol != UAC_VERSION_2) { /* check all control types */ for (i = 0; i < 10; i++) { unsigned int ch_bits = 0;

@@ -1865,13 +1865,13 @@ static int parse_audio_unit(struct mixer_build *state, int unitid) return parse_audio_feature_unit(state, unitid, p1); case UAC1_PROCESSING_UNIT: /* UAC2_EFFECT_UNIT has the same value */

• if (state->mixer->protocol == UAC_VERSION_1)
  

• if (state->mixer->protocol != UAC_VERSION_2)
  return parse_audio_processing_unit(state, unitid, p1);
  

  else return 0; /* FIXME - effect units not implemented yet */ case UAC1_EXTENSION_UNIT: /* UAC2_PROCESSING_UNIT_V2 has the same value */

• if (state->mixer->protocol == UAC_VERSION_1)
  

• if (state->mixer->protocol != UAC_VERSION_2)
  return parse_audio_extension_unit(state, unitid, p1);
  

  else /* UAC_VERSION_2 */ return parse_audio_processing_unit(state, unitid, p1);

@@ -1932,7 +1932,7 @@ static int snd_usb_mixer_controls(struct usb_mixer_interface *mixer)

p = NULL; while ((p = snd_usb_find_csint_desc(hostif->extra, hostif->extralen, p, UAC_OUTPUT_TERMINAL)) != NULL) {

• if (mixer->protocol == UAC_VERSION_1) {
  

• if (mixer->protocol != UAC_VERSION_2) {
  struct uac1_output_terminal_descriptor *desc = p;
  
  if (desc->bLength < sizeof(*desc))
  

@@ -2070,7 +2070,7 @@ static void snd_usb_mixer_interrupt(struct urb *urb) if (urb->status != 0) goto requeue;

• if (mixer->protocol == UAC_VERSION_1) {

• if (mixer->protocol != UAC_VERSION_2) { struct uac1_status_word *status;

  for (status = urb->transfer_buffer;

diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index 3634ced..3b5135c 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -173,13 +173,12 @@ int snd_usb_init_pitch(struct snd_usb_audio *chip, int iface,

switch (altsd->bInterfaceProtocol) { case UAC_VERSION_1:

• default: return init_pitch_v1(chip, iface, alts, fmt);

  case UAC_VERSION_2: return init_pitch_v2(chip, iface, alts, fmt); }

• return -EINVAL;

}

/*