1 files changed, 89 insertions, 22 deletions

diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c
index 5778a9b725ec..93dedde3c428 100644
--- a/sound/usb/usbmidi.c
+++ b/sound/usb/usbmidi.c
@@ -44,6 +44,7 @@
 #include <linux/string.h>
 #include <linux/init.h>
 #include <linux/slab.h>
+#include <linux/timer.h>
 #include <linux/usb.h>
 #include <sound/core.h>
 #include <sound/minors.h>
@@ -56,6 +57,12 @@
  */
 /* #define DUMP_PACKETS */
 
+/*
+ * how long to wait after some USB errors, so that khubd can disconnect() us
+ * without too many spurious errors
+ */
+#define ERROR_DELAY_JIFFIES (HZ / 10)
+
 
 MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
 MODULE_DESCRIPTION("USB Audio/MIDI helper module");
@@ -100,6 +107,7 @@ struct snd_usb_midi {
         snd_rawmidi_t* rmidi;
         struct usb_protocol_ops* usb_protocol_ops;
         struct list_head list;
+        struct timer_list error_timer;
 
         struct snd_usb_midi_endpoint {
                 snd_usb_midi_out_endpoint_t *out;
@@ -141,7 +149,8 @@ struct snd_usb_midi_in_endpoint {
         struct usbmidi_in_port {
                 snd_rawmidi_substream_t* substream;
         } ports[0x10];
-        int seen_f5;
+        u8 seen_f5;
+        u8 error_resubmit;
         int current_port;
 };
 
@@ -167,14 +176,22 @@ static int snd_usbmidi_submit_urb(struct urb* urb, int flags)
  */
 static int snd_usbmidi_urb_error(int status)
 {
-        if (status == -ENOENT)
-                return status; /* killed */
-        if (status == -EILSEQ ||
-            status == -ECONNRESET ||
-            status == -ETIMEDOUT)
-                return -ENODEV; /* device removed/shutdown */
-        snd_printk(KERN_ERR "urb status %d\n", status);
-        return 0; /* continue */
+        switch (status) {
+        /* manually unlinked, or device gone */
+        case -ENOENT:
+        case -ECONNRESET:
+        case -ESHUTDOWN:
+        case -ENODEV:
+                return -ENODEV;
+        /* errors that might occur during unplugging */
+        case -EPROTO:    /* EHCI */
+        case -ETIMEDOUT: /* OHCI */
+        case -EILSEQ:    /* UHCI */
+                return -EIO;
+        default:
+                snd_printk(KERN_ERR "urb status %d\n", status);
+                return 0; /* continue */
+        }
 }
 
 /*
@@ -218,8 +235,15 @@ static void snd_usbmidi_in_urb_complete(struct urb* urb, struct pt_regs *regs)
                 ep->umidi->usb_protocol_ops->input(ep, urb->transfer_buffer,
                                                    urb->actual_length);
         } else {
-                if (snd_usbmidi_urb_error(urb->status) < 0)
+                int err = snd_usbmidi_urb_error(urb->status);
+                if (err < 0) {
+                        if (err != -ENODEV) {
+                                ep->error_resubmit = 1;
+                                mod_timer(&ep->umidi->error_timer,
+                                          jiffies + ERROR_DELAY_JIFFIES);
+                        }
                         return;
+                }
         }
 
         if (usb_pipe_needs_resubmit(urb->pipe)) {
@@ -236,8 +260,13 @@ static void snd_usbmidi_out_urb_complete(struct urb* urb, struct pt_regs *regs)
         ep->urb_active = 0;
         spin_unlock(&ep->buffer_lock);
         if (urb->status < 0) {
-                if (snd_usbmidi_urb_error(urb->status) < 0)
+                int err = snd_usbmidi_urb_error(urb->status);
+                if (err < 0) {
+                        if (err != -ENODEV)
+                                mod_timer(&ep->umidi->error_timer,
+                                          jiffies + ERROR_DELAY_JIFFIES);
                         return;
+                }
         }
         snd_usbmidi_do_output(ep);
 }
@@ -276,6 +305,24 @@ static void snd_usbmidi_out_tasklet(unsigned long data)
         snd_usbmidi_do_output(ep);
 }
 
+/* called after transfers had been interrupted due to some USB error */
+static void snd_usbmidi_error_timer(unsigned long data)
+{
+        snd_usb_midi_t *umidi = (snd_usb_midi_t *)data;
+        int i;
+
+        for (i = 0; i < MIDI_MAX_ENDPOINTS; ++i) {
+                snd_usb_midi_in_endpoint_t *in = umidi->endpoints[i].in;
+                if (in && in->error_resubmit) {
+                        in->error_resubmit = 0;
+                        in->urb->dev = umidi->chip->dev;
+                        snd_usbmidi_submit_urb(in->urb, GFP_ATOMIC);
+                }
+                if (umidi->endpoints[i].out)
+                        snd_usbmidi_do_output(umidi->endpoints[i].out);
+        }
+}
+
 /* helper function to send static data that may not DMA-able */
 static int send_bulk_static_data(snd_usb_midi_out_endpoint_t* ep,
                                  const void *data, int len)
@@ -594,17 +641,20 @@ static void snd_usbmidi_emagic_finish_out(snd_usb_midi_out_endpoint_t* ep)
 static void snd_usbmidi_emagic_input(snd_usb_midi_in_endpoint_t* ep,
                                      uint8_t* buffer, int buffer_length)
 {
-        /* ignore padding bytes at end of buffer */
-        while (buffer_length > 0 && buffer[buffer_length - 1] == 0xff)
-                --buffer_length;
+        int i;
+
+        /* FF indicates end of valid data */
+        for (i = 0; i < buffer_length; ++i)
+                if (buffer[i] == 0xff) {
+                        buffer_length = i;
+                        break;
+                }
 
         /* handle F5 at end of last buffer */
         if (ep->seen_f5)
                 goto switch_port;
 
         while (buffer_length > 0) {
-                int i;
-
                 /* determine size of data until next F5 */
                 for (i = 0; i < buffer_length; ++i)
                         if (buffer[i] == 0xf5)
@@ -671,6 +721,10 @@ static void snd_usbmidi_emagic_output(snd_usb_midi_out_endpoint_t* ep)
                                 break;
                 }
         }
+        if (buf_free < ep->max_transfer && buf_free > 0) {
+                *buf = 0xff;
+                --buf_free;
+        }
         ep->urb->transfer_buffer_length = ep->max_transfer - buf_free;
 }
 
@@ -765,7 +819,10 @@ static snd_rawmidi_ops_t snd_usbmidi_input_ops = {
 static void snd_usbmidi_in_endpoint_delete(snd_usb_midi_in_endpoint_t* ep)
 {
         if (ep->urb) {
-                kfree(ep->urb->transfer_buffer);
+                usb_buffer_free(ep->umidi->chip->dev,
+                                ep->urb->transfer_buffer_length,
+                                ep->urb->transfer_buffer,
+                                ep->urb->transfer_dma);
                 usb_free_urb(ep->urb);
         }
         kfree(ep);
@@ -799,7 +856,8 @@ static int snd_usbmidi_in_endpoint_create(snd_usb_midi_t* umidi,
         else
                 pipe = usb_rcvbulkpipe(umidi->chip->dev, ep_info->in_ep);
         length = usb_maxpacket(umidi->chip->dev, pipe, 0);
-        buffer = kmalloc(length, GFP_KERNEL);
+        buffer = usb_buffer_alloc(umidi->chip->dev, length, GFP_KERNEL,
+                                  &ep->urb->transfer_dma);
         if (!buffer) {
                 snd_usbmidi_in_endpoint_delete(ep);
                 return -ENOMEM;
@@ -812,6 +870,7 @@ static int snd_usbmidi_in_endpoint_create(snd_usb_midi_t* umidi,
                 usb_fill_bulk_urb(ep->urb, umidi->chip->dev, pipe, buffer, length,
                                   snd_usb_complete_callback(snd_usbmidi_in_urb_complete),
                                   ep);
+        ep->urb->transfer_flags = URB_NO_TRANSFER_DMA_MAP;
 
         rep->in = ep;
         return 0;
@@ -832,10 +891,10 @@ static unsigned int snd_usbmidi_count_bits(unsigned int x)
  */
 static void snd_usbmidi_out_endpoint_delete(snd_usb_midi_out_endpoint_t* ep)
 {
-        if (ep->tasklet.func)
-                tasklet_kill(&ep->tasklet);
         if (ep->urb) {
-                kfree(ep->urb->transfer_buffer);
+                usb_buffer_free(ep->umidi->chip->dev, ep->max_transfer,
+                                ep->urb->transfer_buffer,
+                                ep->urb->transfer_dma);
                 usb_free_urb(ep->urb);
         }
         kfree(ep);
@@ -867,7 +926,8 @@ static int snd_usbmidi_out_endpoint_create(snd_usb_midi_t* umidi,
         /* we never use interrupt output pipes */
         pipe = usb_sndbulkpipe(umidi->chip->dev, ep_info->out_ep);
         ep->max_transfer = usb_maxpacket(umidi->chip->dev, pipe, 1);
-        buffer = kmalloc(ep->max_transfer, GFP_KERNEL);
+        buffer = usb_buffer_alloc(umidi->chip->dev, ep->max_transfer,
+                                  GFP_KERNEL, &ep->urb->transfer_dma);
         if (!buffer) {
                 snd_usbmidi_out_endpoint_delete(ep);
                 return -ENOMEM;
@@ -875,6 +935,7 @@ static int snd_usbmidi_out_endpoint_create(snd_usb_midi_t* umidi,
         usb_fill_bulk_urb(ep->urb, umidi->chip->dev, pipe, buffer,
                           ep->max_transfer,
                           snd_usb_complete_callback(snd_usbmidi_out_urb_complete), ep);
+        ep->urb->transfer_flags = URB_NO_TRANSFER_DMA_MAP;
 
         spin_lock_init(&ep->buffer_lock);
         tasklet_init(&ep->tasklet, snd_usbmidi_out_tasklet, (unsigned long)ep);
@@ -918,8 +979,11 @@ void snd_usbmidi_disconnect(struct list_head* p)
         int i;
 
         umidi = list_entry(p, snd_usb_midi_t, list);
+        del_timer_sync(&umidi->error_timer);
         for (i = 0; i < MIDI_MAX_ENDPOINTS; ++i) {
                 snd_usb_midi_endpoint_t* ep = &umidi->endpoints[i];
+                if (ep->out)
+                        tasklet_kill(&ep->out->tasklet);
                 if (ep->out && ep->out->urb) {
                         usb_kill_urb(ep->out->urb);
                         if (umidi->usb_protocol_ops->finish_out_endpoint)
@@ -1480,6 +1544,9 @@ int snd_usb_create_midi_interface(snd_usb_audio_t* chip,
         umidi->iface = iface;
         umidi->quirk = quirk;
         umidi->usb_protocol_ops = &snd_usbmidi_standard_ops;
+        init_timer(&umidi->error_timer);
+        umidi->error_timer.function = snd_usbmidi_error_timer;
+        umidi->error_timer.data = (unsigned long)umidi;
 
         /* detect the endpoint(s) to use */
         memset(endpoints, 0, sizeof(endpoints));