korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-24 04:34:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: usb-audio: Add sampling rates support for Mbox3

Browse Source 
This adds support for all sample rates supported by the
hardware,Digidesign Mbox 3 supports: {44100, 48000, 88200, 96000}

Fixes syncing clock issues that presented as pops. To test this, without
this patch playing 440hz tone produces pops.

Clock is now synced between playback and capture interfaces so no more
latency drift issue when using pipewire pro-profile.
(https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3900)

Signed-off-by: Manuel Barrio Linares <mbarriolinares@gmail.com>
Link: https://lore.kernel.org/r/20240430171020.192285-1-mbarriolinares@gmail.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Manuel Barrio Linares 2024-04-30 14:10:18 -03:00 committed by Takashi Iwai
parent 4bfea1dcd5
commit 44f69ddccb
2 changed files with 81 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sound/usb/quirks-table.h
View File

@ -3013,21 +3013,28 @@ YAMAHA_DEVICE(0x7010, "UB99"),
.type = QUIRK_AUDIO_FIXED_ENDPOINT,
.data = &(const struct audioformat) {
.formats = SNDRV_PCM_FMTBIT_S24_3LE,
.fmt_bits = 24,
.channels = 4,
.iface = 2,
.altsetting = 1,
.altset_idx = 1,
.attributes = 0x00,
.endpoint = 0x01,
.endpoint = USB_RECIP_INTERFACE | USB_DIR_OUT,
.ep_attr = USB_ENDPOINT_XFER_ISOC |
USB_ENDPOINT_SYNC_ASYNC,
.rates = SNDRV_PCM_RATE_48000,
.rate_min = 48000,
.rate_max = 48000,
.nr_rates = 1,
.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[]) {
48000
}
44100, 48000, 88200, 96000
},
.sync_ep = USB_RECIP_INTERFACE | USB_DIR_IN,
.sync_iface = 3,
.sync_altsetting = 1,
.sync_ep_idx = 1,
.implicit_fb = 1,
}
},
{
@ -3035,22 +3042,25 @@ YAMAHA_DEVICE(0x7010, "UB99"),
.type = QUIRK_AUDIO_FIXED_ENDPOINT,
.data = &(const struct audioformat) {
.formats = SNDRV_PCM_FMTBIT_S24_3LE,
.fmt_bits = 24,
.channels = 4,
.iface = 3,
.altsetting = 1,
.altset_idx = 1,
.endpoint = 0x81,
.attributes = 0x00,
.endpoint = USB_RECIP_INTERFACE | USB_DIR_IN,
.ep_attr = USB_ENDPOINT_XFER_ISOC |
USB_ENDPOINT_SYNC_ASYNC,
.maxpacksize = 0x009c,
.rates = SNDRV_PCM_RATE_48000,
.rate_min = 48000,
.rate_max = 48000,
.nr_rates = 1,
.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[]) {
48000
}
44100, 48000, 88200, 96000
},
.implicit_fb = 0,
}
},
{

74
sound/usb/quirks.c
View File

@ -984,21 +984,13 @@ static int snd_usb_axefx3_boot_quirk(struct usb_device *dev)
return 0;
}
static void mbox3_setup_48_24_magic(struct usb_device *dev)
static void mbox3_setup_defaults(struct usb_device *dev)
{
/* The Mbox 3 is "little endian" */
/* max volume is: 0x0000. */
/* min volume is: 0x0080 (shown in little endian form) */
/* Load 48000Hz rate into buffer */
u8 com_buff[4] = {0x80, 0xbb, 0x00, 0x00};
/* Set 48000Hz sample rate */
snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0),
0x01, 0x21, 0x0100, 0x0001, &com_buff, 4); //Is this really needed?
snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0),
0x01, 0x21, 0x0100, 0x8101, &com_buff, 4);
u8 com_buff[2];
/* Deactivate Tuner */
/* on = 0x01*/
@ -1008,6 +1000,8 @@ static void mbox3_setup_48_24_magic(struct usb_device *dev)
0x01, 0x21, 0x0003, 0x2001, &com_buff, 1);
/* Set clock source to Internal (as opposed to S/PDIF) */
/* Internal = 0x01*/
/* S/PDIF = 0x02*/
com_buff[0] = 0x01;
snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0),
1, 0x21, 0x0100, 0x8001, &com_buff, 1);
@ -1113,9 +1107,11 @@ static void mbox3_setup_48_24_magic(struct usb_device *dev)
1, 0x21, 0x0107, 0x4201, &com_buff, 2);
/* Toggle allowing host control */
/* Not needed
com_buff[0] = 0x02;
snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0),
3, 0x21, 0x0000, 0x2001, &com_buff, 1);
*/
/* Do not dim fx returns */
com_buff[0] = 0x00;
@ -1259,26 +1255,27 @@ static int snd_usb_mbox3_boot_quirk(struct usb_device *dev)
descriptor_size = le16_to_cpu(get_cfg_desc(config)->wTotalLength);
if (descriptor_size != MBOX3_DESCRIPTOR_SIZE) {
dev_err(&dev->dev, "Invalid descriptor size=%d.\n", descriptor_size);
dev_err(&dev->dev, "MBOX3: Invalid descriptor size=%d.\n", descriptor_size);
return -ENODEV;
}
dev_dbg(&dev->dev, "device initialised!\n");
dev_dbg(&dev->dev, "MBOX3: device initialised!\n");
err = usb_get_descriptor(dev, USB_DT_DEVICE, 0,
&dev->descriptor, sizeof(dev->descriptor));
config = dev->actconfig;
if (err < 0)
dev_dbg(&dev->dev, "error usb_get_descriptor: %d\n", err);
dev_dbg(&dev->dev, "MBOX3: error usb_get_descriptor: %d\n", err);
err = usb_reset_configuration(dev);
if (err < 0)
dev_dbg(&dev->dev, "error usb_reset_configuration: %d\n", err);
dev_dbg(&dev->dev, "mbox3_boot: new boot length = %d\n",
dev_dbg(&dev->dev, "MBOX3: error usb_reset_configuration: %d\n", err);
dev_dbg(&dev->dev, "MBOX3: new boot length = %d\n",
le16_to_cpu(get_cfg_desc(config)->wTotalLength));
mbox3_setup_48_24_magic(dev);
dev_info(&dev->dev, "Digidesign Mbox 3: 24bit 48kHz");
mbox3_setup_defaults(dev);
dev_info(&dev->dev, "MBOX3: Initialized.");
return 0; /* Successful boot */
}
@ -1734,6 +1731,46 @@ static int pioneer_djm_set_format_quirk(struct snd_usb_substream *subs,
return 0;
}
static void mbox3_set_format_quirk(struct snd_usb_substream *subs,
const struct audioformat *fmt)
{
__le32 buff4 = 0;
u8 buff1 = 0x01;
u32 new_rate = subs->data_endpoint->cur_rate;
u32 current_rate;
// Get current rate from card and check if changing it is needed
snd_usb_ctl_msg(subs->dev, usb_sndctrlpipe(subs->dev, 0),
0x01, 0x21 | USB_DIR_IN, 0x0100, 0x8101, &buff4, 4);
current_rate = le32_to_cpu(buff4);
dev_dbg(&subs->dev->dev,
"MBOX3: Current configured sample rate: %d", current_rate);
if (current_rate == new_rate) {
dev_dbg(&subs->dev->dev,
"MBOX3: No change needed (current rate:%d == new rate:%d)",
current_rate, new_rate);
return;
}
// Set new rate
dev_info(&subs->dev->dev,
"MBOX3: Changing sample rate to: %d", new_rate);
buff4 = cpu_to_le32(new_rate);
snd_usb_ctl_msg(subs->dev, usb_sndctrlpipe(subs->dev, 0),
0x01, 0x21, 0x0100, 0x8101, &buff4, 4);
// Set clock source to Internal
snd_usb_ctl_msg(subs->dev, usb_sndctrlpipe(subs->dev, 0),
0x01, 0x21, 0x0100, 0x8001, &buff1, 1);
// Check whether the change was successful
buff4 = 0;
snd_usb_ctl_msg(subs->dev, usb_sndctrlpipe(subs->dev, 0),
0x01, 0x21 | USB_DIR_IN, 0x0100, 0x8101, &buff4, 4);
if (new_rate != le32_to_cpu(buff4))
dev_warn(&subs->dev->dev, "MBOX3: Couldn't set the sample rate");
}
void snd_usb_set_format_quirk(struct snd_usb_substream *subs,
const struct audioformat *fmt)
{
@ -1755,6 +1792,9 @@ void snd_usb_set_format_quirk(struct snd_usb_substream *subs,
case USB_ID(0x08e4, 0x0163): /* Pioneer DJM-850 */
pioneer_djm_set_format_quirk(subs, 0x0086);
break;
case USB_ID(0x0dba, 0x5000):
mbox3_set_format_quirk(subs, fmt); /* Digidesign Mbox 3 */
break;
}
}