Merge tag 'usb-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[cascardo/linux.git] / drivers / usb / class / cdc-acm.c

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 6c6928a..e934e19 100644 (file)
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -416,19 +416,21 @@ static void acm_read_bulk_callback(struct urb *urb)
                dev_dbg(&acm->data->dev, "%s - disconnected\n", __func__);
                return;
        }
-       usb_mark_last_busy(acm->dev);
 
        if (urb->status) {
                dev_dbg(&acm->data->dev, "%s - non-zero urb status: %d\n",
                                                        __func__, urb->status);
                return;
        }
+
+       usb_mark_last_busy(acm->dev);
+
        acm_process_read_urb(acm, urb);
 
        /* throttle device if requested by tty */
        spin_lock_irqsave(&acm->read_lock, flags);
        acm->throttled = acm->throttle_req;
-       if (!acm->throttled && !acm->susp_count) {
+       if (!acm->throttled) {
                spin_unlock_irqrestore(&acm->read_lock, flags);
                acm_submit_read_urb(acm, rb->index, GFP_ATOMIC);
        } else {
@@ -502,10 +504,30 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp)
        return tty_port_open(&acm->port, tty, filp);
 }
 
+static void acm_port_dtr_rts(struct tty_port *port, int raise)
+{
+       struct acm *acm = container_of(port, struct acm, port);
+       int val;
+       int res;
+
+       if (raise)
+               val = ACM_CTRL_DTR | ACM_CTRL_RTS;
+       else
+               val = 0;
+
+       /* FIXME: add missing ctrlout locking throughout driver */
+       acm->ctrlout = val;
+
+       res = acm_set_control(acm, val);
+       if (res && (acm->ctrl_caps & USB_CDC_CAP_LINE))
+               dev_err(&acm->control->dev, "failed to set dtr/rts\n");
+}
+
 static int acm_port_activate(struct tty_port *port, struct tty_struct *tty)
 {
        struct acm *acm = container_of(port, struct acm, port);
        int retval = -ENODEV;
+       int i;
 
        dev_dbg(&acm->control->dev, "%s\n", __func__);
 
@@ -532,11 +554,6 @@ static int acm_port_activate(struct tty_port *port, struct tty_struct *tty)
                goto error_submit_urb;
        }
 
-       acm->ctrlout = ACM_CTRL_DTR | ACM_CTRL_RTS;
-       retval = acm_set_control(acm, acm->ctrlout);
-       if (retval < 0 && (acm->ctrl_caps & USB_CDC_CAP_LINE))
-               goto error_set_control;
-
        /*
         * Unthrottle device in case the TTY was closed while throttled.
         */
@@ -556,9 +573,8 @@ static int acm_port_activate(struct tty_port *port, struct tty_struct *tty)
        return 0;
 
 error_submit_read_urbs:
-       acm->ctrlout = 0;
-       acm_set_control(acm, acm->ctrlout);
-error_set_control:
+       for (i = 0; i < acm->rx_buflimit; i++)
+               usb_kill_urb(acm->read_urbs[i]);
        usb_kill_urb(acm->ctrlurb);
 error_submit_urb:
        usb_autopm_put_interface(acm->control);
@@ -590,29 +606,31 @@ static void acm_port_shutdown(struct tty_port *port)
 
        dev_dbg(&acm->control->dev, "%s\n", __func__);
 
-       mutex_lock(&acm->mutex);
-       if (!acm->disconnected) {
-               usb_autopm_get_interface(acm->control);
-               acm_set_control(acm, acm->ctrlout = 0);
+       /*
+        * Need to grab write_lock to prevent race with resume, but no need to
+        * hold it due to the tty-port initialised flag.
+        */
+       spin_lock_irq(&acm->write_lock);
+       spin_unlock_irq(&acm->write_lock);
 
-               for (;;) {
-                       urb = usb_get_from_anchor(&acm->delayed);
-                       if (!urb)
-                               break;
-                       wb = urb->context;
-                       wb->use = 0;
-                       usb_autopm_put_interface_async(acm->control);
-               }
+       usb_autopm_get_interface_no_resume(acm->control);
+       acm->control->needs_remote_wakeup = 0;
+       usb_autopm_put_interface(acm->control);
 
-               usb_kill_urb(acm->ctrlurb);
-               for (i = 0; i < ACM_NW; i++)
-                       usb_kill_urb(acm->wb[i].urb);
-               for (i = 0; i < acm->rx_buflimit; i++)
-                       usb_kill_urb(acm->read_urbs[i]);
-               acm->control->needs_remote_wakeup = 0;
-               usb_autopm_put_interface(acm->control);
+       for (;;) {
+               urb = usb_get_from_anchor(&acm->delayed);
+               if (!urb)
+                       break;
+               wb = urb->context;
+               wb->use = 0;
+               usb_autopm_put_interface_async(acm->control);
        }
-       mutex_unlock(&acm->mutex);
+
+       usb_kill_urb(acm->ctrlurb);
+       for (i = 0; i < ACM_NW; i++)
+               usb_kill_urb(acm->wb[i].urb);
+       for (i = 0; i < acm->rx_buflimit; i++)
+               usb_kill_urb(acm->read_urbs[i]);
 }
 
 static void acm_tty_cleanup(struct tty_struct *tty)
@@ -681,7 +699,6 @@ static int acm_tty_write(struct tty_struct *tty,
                spin_unlock_irqrestore(&acm->write_lock, flags);
                return count;
        }
-       usb_mark_last_busy(acm->dev);
 
        stat = acm_start_wb(acm, wb);
        spin_unlock_irqrestore(&acm->write_lock, flags);
@@ -984,6 +1001,7 @@ static void acm_tty_set_termios(struct tty_struct *tty,
 }
 
 static const struct tty_port_operations acm_port_ops = {
+       .dtr_rts = acm_port_dtr_rts,
        .shutdown = acm_port_shutdown,
        .activate = acm_port_activate,
        .destruct = acm_port_destruct,
@@ -1421,8 +1439,6 @@ skip_countries:
 
        dev_info(&intf->dev, "ttyACM%d: USB ACM device\n", minor);
 
-       acm_set_control(acm, acm->ctrlout);
-
        acm->line.dwDTERate = cpu_to_le32(9600);
        acm->line.bDataBits = 8;
        acm_set_line(acm, &acm->line);
@@ -1541,18 +1557,15 @@ static int acm_suspend(struct usb_interface *intf, pm_message_t message)
        struct acm *acm = usb_get_intfdata(intf);
        int cnt;
 
-       spin_lock_irq(&acm->read_lock);
-       spin_lock(&acm->write_lock);
+       spin_lock_irq(&acm->write_lock);
        if (PMSG_IS_AUTO(message)) {
                if (acm->transmitting) {
-                       spin_unlock(&acm->write_lock);
-                       spin_unlock_irq(&acm->read_lock);
+                       spin_unlock_irq(&acm->write_lock);
                        return -EBUSY;
                }
        }
        cnt = acm->susp_count++;
-       spin_unlock(&acm->write_lock);
-       spin_unlock_irq(&acm->read_lock);
+       spin_unlock_irq(&acm->write_lock);
 
        if (cnt)
                return 0;
@@ -1568,8 +1581,7 @@ static int acm_resume(struct usb_interface *intf)
        struct urb *urb;
        int rv = 0;
 
-       spin_lock_irq(&acm->read_lock);
-       spin_lock(&acm->write_lock);
+       spin_lock_irq(&acm->write_lock);
 
        if (--acm->susp_count)
                goto out;
@@ -1595,8 +1607,7 @@ static int acm_resume(struct usb_interface *intf)
                rv = acm_submit_read_urbs(acm, GFP_ATOMIC);
        }
 out:
-       spin_unlock(&acm->write_lock);
-       spin_unlock_irq(&acm->read_lock);
+       spin_unlock_irq(&acm->write_lock);
 
        return rv;
 }