5 files changed, 252 insertions, 3 deletions

diff --git a/sound/usb/midi.c b/sound/usb/midi.c
index 8e01fa4991c5..63dd0545a672 100644
--- a/sound/usb/midi.c
+++ b/sound/usb/midi.c
@@ -1948,6 +1948,44 @@ static int snd_usbmidi_detect_yamaha(struct snd_usb_midi* umidi,
 }
 
 /*
+ * Detects the endpoints and ports of Roland devices.
+ */
+static int snd_usbmidi_detect_roland(struct snd_usb_midi* umidi,
+                                     struct snd_usb_midi_endpoint_info* endpoint)
+{
+        struct usb_interface* intf;
+        struct usb_host_interface *hostif;
+        u8* cs_desc;
+
+        intf = umidi->iface;
+        if (!intf)
+                return -ENOENT;
+        hostif = intf->altsetting;
+        /*
+         * Some devices have a descriptor <06 24 F1 02 <inputs> <outputs>>,
+         * some have standard class descriptors, or both kinds, or neither.
+         */
+        for (cs_desc = hostif->extra;
+             cs_desc < hostif->extra + hostif->extralen && cs_desc[0] >= 2;
+             cs_desc += cs_desc[0]) {
+                if (cs_desc[0] >= 6 &&
+                    cs_desc[1] == USB_DT_CS_INTERFACE &&
+                    cs_desc[2] == 0xf1 &&
+                    cs_desc[3] == 0x02) {
+                        endpoint->in_cables  = (1 << cs_desc[4]) - 1;
+                        endpoint->out_cables = (1 << cs_desc[5]) - 1;
+                        return snd_usbmidi_detect_endpoints(umidi, endpoint, 1);
+                } else if (cs_desc[0] >= 7 &&
+                           cs_desc[1] == USB_DT_CS_INTERFACE &&
+                           cs_desc[2] == UAC_HEADER) {
+                        return snd_usbmidi_get_ms_info(umidi, endpoint);
+                }
+        }
+
+        return -ENODEV;
+}
+
+/*
  * Creates the endpoints and their ports for Midiman devices.
  */
 static int snd_usbmidi_create_endpoints_midiman(struct snd_usb_midi* umidi,
@@ -2162,6 +2200,9 @@ int snd_usbmidi_create(struct snd_card *card,
         case QUIRK_MIDI_YAMAHA:
                 err = snd_usbmidi_detect_yamaha(umidi, &endpoints[0]);
                 break;
+        case QUIRK_MIDI_ROLAND:
+                err = snd_usbmidi_detect_roland(umidi, &endpoints[0]);
+                break;
         case QUIRK_MIDI_MIDIMAN:
                 umidi->usb_protocol_ops = &snd_usbmidi_midiman_ops;
                 memcpy(&endpoints[0], quirk->data,
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
index 7f1722f82c89..b47517d47b08 100644
--- a/sound/usb/quirks-table.h
+++ b/sound/usb/quirks-table.h
@@ -455,6 +455,17 @@ YAMAHA_DEVICE(0x7000, "DTX"),
 YAMAHA_DEVICE(0x7010, "UB99"),
 #undef YAMAHA_DEVICE
 #undef YAMAHA_INTERFACE
+/* this catches most recent vendor-specific Yamaha devices */
+{
+        .match_flags = USB_DEVICE_ID_MATCH_VENDOR |
+                       USB_DEVICE_ID_MATCH_INT_CLASS,
+        .idVendor = 0x0499,
+        .bInterfaceClass = USB_CLASS_VENDOR_SPEC,
+        .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
+                .ifnum = QUIRK_ANY_INTERFACE,
+                .type = QUIRK_AUTODETECT
+        }
+},
 
 /*
  * Roland/RolandED/Edirol/BOSS devices
@@ -2031,6 +2042,17 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                 }
         }
 },
+/* this catches most recent vendor-specific Roland devices */
+{
+        .match_flags = USB_DEVICE_ID_MATCH_VENDOR |
+                       USB_DEVICE_ID_MATCH_INT_CLASS,
+        .idVendor = 0x0582,
+        .bInterfaceClass = USB_CLASS_VENDOR_SPEC,
+        .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
+                .ifnum = QUIRK_ANY_INTERFACE,
+                .type = QUIRK_AUTODETECT
+        }
+},
 
 /* Guillemot devices */
 {
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 3879eae7e874..5363bcca9494 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -18,6 +18,7 @@
 #include <linux/slab.h>
 #include <linux/usb.h>
 #include <linux/usb/audio.h>
+#include <linux/usb/midi.h>
 
 #include <sound/control.h>
 #include <sound/core.h>
@@ -175,6 +176,178 @@ static int create_fixed_stream_quirk(struct snd_usb_audio *chip,
         return 0;
 }
 
+static int create_auto_pcm_quirk(struct snd_usb_audio *chip,
+                                 struct usb_interface *iface,
+                                 struct usb_driver *driver)
+{
+        struct usb_host_interface *alts;
+        struct usb_interface_descriptor *altsd;
+        struct usb_endpoint_descriptor *epd;
+        struct uac1_as_header_descriptor *ashd;
+        struct uac_format_type_i_discrete_descriptor *fmtd;
+
+        /*
+         * Most Roland/Yamaha audio streaming interfaces have more or less
+         * standard descriptors, but older devices might lack descriptors, and
+         * future ones might change, so ensure that we fail silently if the
+         * interface doesn't look exactly right.
+         */
+
+        /* must have a non-zero altsetting for streaming */
+        if (iface->num_altsetting < 2)
+                return -ENODEV;
+        alts = &iface->altsetting[1];
+        altsd = get_iface_desc(alts);
+
+        /* must have an isochronous endpoint for streaming */
+        if (altsd->bNumEndpoints < 1)
+                return -ENODEV;
+        epd = get_endpoint(alts, 0);
+        if (!usb_endpoint_xfer_isoc(epd))
+                return -ENODEV;
+
+        /* must have format descriptors */
+        ashd = snd_usb_find_csint_desc(alts->extra, alts->extralen, NULL,
+                                       UAC_AS_GENERAL);
+        fmtd = snd_usb_find_csint_desc(alts->extra, alts->extralen, NULL,
+                                       UAC_FORMAT_TYPE);
+        if (!ashd || ashd->bLength < 7 ||
+            !fmtd || fmtd->bLength < 8)
+                return -ENODEV;
+
+        return create_standard_audio_quirk(chip, iface, driver, NULL);
+}
+
+static int create_yamaha_midi_quirk(struct snd_usb_audio *chip,
+                                    struct usb_interface *iface,
+                                    struct usb_driver *driver,
+                                    struct usb_host_interface *alts)
+{
+        static const struct snd_usb_audio_quirk yamaha_midi_quirk = {
+                .type = QUIRK_MIDI_YAMAHA
+        };
+        struct usb_midi_in_jack_descriptor *injd;
+        struct usb_midi_out_jack_descriptor *outjd;
+
+        /* must have some valid jack descriptors */
+        injd = snd_usb_find_csint_desc(alts->extra, alts->extralen,
+                                       NULL, USB_MS_MIDI_IN_JACK);
+        outjd = snd_usb_find_csint_desc(alts->extra, alts->extralen,
+                                        NULL, USB_MS_MIDI_OUT_JACK);
+        if (!injd && !outjd)
+                return -ENODEV;
+        if (injd && (injd->bLength < 5 ||
+                     (injd->bJackType != USB_MS_EMBEDDED &&
+                      injd->bJackType != USB_MS_EXTERNAL)))
+                return -ENODEV;
+        if (outjd && (outjd->bLength < 6 ||
+                      (outjd->bJackType != USB_MS_EMBEDDED &&
+                       outjd->bJackType != USB_MS_EXTERNAL)))
+                return -ENODEV;
+        return create_any_midi_quirk(chip, iface, driver, &yamaha_midi_quirk);
+}
+
+static int create_roland_midi_quirk(struct snd_usb_audio *chip,
+                                    struct usb_interface *iface,
+                                    struct usb_driver *driver,
+                                    struct usb_host_interface *alts)
+{
+        static const struct snd_usb_audio_quirk roland_midi_quirk = {