Changeset 12063

Timestamp:

05/08/09 15:46:41 (4 years ago)

Author:

BrainSlayer

Message:

latest sierra driver

File:

• src/linux/xscale/linux-2.6.23/drivers/usb/serial/sierra.c (modified) (39 diffs)

src/linux/xscale/linux-2.6.23/drivers/usb/serial/sierra.c

@@ -3 +3 @@
 
   Copyright (C) 2006, 2007, 2008  Kevin Lloyd <klloyd@sierrawireless.com>
+ 
+  Copyright (C) 2008, 2009 Elina Pasheva, Matthew Safar, Rory Filer
+                           <linux@sierrawireless.com>
 
   IMPORTANT DISCLAIMER: This driver is not commercially supported by
@@ -16 +19 @@
   Back ported to kernel 2.6.23
 */
-
-#define DRIVER_VERSION "v.1.3.1b"
-#define DRIVER_AUTHOR "Kevin Lloyd <klloyd@sierrawireless.com>"
+/* Uncomment to log function calls */
+/*#define DEBUG*/
+#define DRIVER_VERSION "v.1.7.0"
+#define DRIVER_AUTHOR "Kevin Lloyd, Elina Pasheva, Matthew Safar, Rory Filer"
 #define DRIVER_DESC "USB Driver for Sierra Wireless USB modems"
 
@@ -29 +33 @@
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
-#include <linux/usb/ch9.h>
 
 #define SWIMS_USB_REQUEST_SetPower      0x00
@@ -36 +39 @@
 #define SWIMS_SET_MODE_Modem            0x0001
 
-/* per port private data */
 #define N_IN_URB        8
 #define N_OUT_URB       64
 #define IN_BUFLEN       4096
 
-
-#define MAX_TRANSFER (PAGE_SIZE - 512)
+#define MAX_TRANSFER            (PAGE_SIZE - 512)
+/* MAX_TRANSFER is chosen so that the VM is not stressed by
+   allocations > PAGE_SIZE and the number of packets in a page
+   is an integer 512 is the largest possible packet on EHCI */
 
 static int debug;
 static int nmea;
 static int truinstall = 1;
+static int suspend_support;
 
 enum devicetype {
-        DEVICE_3_PORT =         0,
-        DEVICE_1_PORT =         1,
-        DEVICE_INSTALLER =      2,
+        DEVICE_MODEM =          0,
+        DEVICE_INSTALLER =      1,
 };
 
+/* list of interface numbers - used for constructing interface blacklists */
+struct list {
+        const u32 listlen; /* number of interface numbers on list */
+        const u8  *list;   /* pointer to the array holding the numbers */
+};
+
+/* static device type specific data */
+struct sierra_device_static_info {
+        const enum devicetype   dev_type;
+        const struct list       iface_blacklist;
+};
+
 static int sierra_set_power_state(struct usb_device *udev, __u16 swiState)
 {
         int result;
-        dev_dbg(&udev->dev, "%s", __func__);
+        dev_dbg(&udev->dev, "%s\n", __func__);
         result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
                         SWIMS_USB_REQUEST_SetPower,     /* __u8 request      */
@@ -72 +88 @@
 {
         int result;
-        dev_dbg(&udev->dev, "%s", "DEVICE MODE SWITCH\n");
+        dev_dbg(&udev->dev, "%s\n", "DEVICE MODE SWITCH");
         result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
                         SWIMS_USB_REQUEST_SetMode,      /* __u8 request      */
@@ -87 +103 @@
 {
         int result;
-        dev_dbg(&udev->dev, "%s", __func__);
+        dev_dbg(&udev->dev, "%s\n", __func__);
         result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
                         SWIMS_USB_REQUEST_SetNmea,      /* __u8 request      */
@@ -101 +117 @@
 static int sierra_calc_num_ports(struct usb_serial *serial)
 {
-        int result;
-        int *num_ports = usb_get_serial_data(serial);
-        dev_dbg(&serial->dev->dev, "%s", __func__);
-
-        result = *num_ports;
-
-        if (result) {
-                kfree(num_ports);
-                usb_set_serial_data(serial, NULL);
-        }
-
-        return result;
+        int num_ports = 0;
+        u8 ifnum, numendpoints;
+        
+        dev_dbg(&serial->dev->dev, "%s\n", __func__);
+        
+        ifnum = serial->interface->cur_altsetting->desc.bInterfaceNumber;
+        numendpoints = serial->interface->cur_altsetting->desc.bNumEndpoints;
+        
+        /* Dummy interface present on some SKUs should be ignored */
+        if (ifnum == 0x99)
+                num_ports = 0;
+        else if (numendpoints <= 3)
+                num_ports = 1;
+        else
+                num_ports = (numendpoints-1)/2;
+        return num_ports;
+}
+
+static int is_blacklisted(const u8 ifnum, const struct list *blacklist)
+{
+        const u8  *list;
+        int i;
+        
+        if (blacklist) {
+                list = blacklist->list;
+                
+                for (i=0; i < blacklist->listlen; i++) {
+                        if (list[i] == ifnum)
+                                return 1;
+                }
+        }
+        return 0;
 }
 
@@ -120 +156 @@
         struct usb_interface *p_interface;
         struct usb_host_interface *p_host_interface;
-        dev_dbg(&serial->dev->dev, "%s", __func__);
+        dev_dbg(&serial->dev->dev, "%s\n", __func__);
 
         /* Get the interface structure pointer from the serial struct */
@@ -139 +175 @@
                         const struct usb_device_id *id)
 {
+        const struct sierra_device_static_info * info;  
         int result = 0;
         struct usb_device *udev;
-        int *num_ports;
-        u8 ifnum, ifclass, numendpoints;
-
-        dev_dbg(&serial->dev->dev, "%s", __func__);
-
-        num_ports = kmalloc(sizeof(*num_ports), GFP_KERNEL);
-        if (!num_ports)
-                return -ENOMEM;
-
-        ifnum = serial->interface->cur_altsetting->desc.bInterfaceNumber;
+        u8 ifnum, ifclass; 
+
+        udev = serial->dev;
+        dev_dbg(&udev->dev, "%s\n", __func__);
+
+        /* Check TRU-Install first */
+        info = (const struct sierra_device_static_info *)id->driver_info;
         ifclass = serial->interface->cur_altsetting->desc.bInterfaceClass;
-        numendpoints = serial->interface->cur_altsetting->desc.bNumEndpoints;
-        udev = serial->dev;
-
-        /* Figure out the interface number from the serial structure */
+        if (ifclass == USB_CLASS_MASS_STORAGE) {
+                /* If TRU-Install support is enabled, force to modem mode */
+                if (truinstall && info && info->dev_type == DEVICE_INSTALLER) {
+                        dev_dbg(&udev->dev, "%s\n", "FOUND TRU-INSTALL DEVICE");
+                        result = sierra_set_ms_mode(udev, SWIMS_SET_MODE_Modem);
+                }
+                return -ENODEV;
+        }
+        
         ifnum = sierra_calc_interface(serial);
-
+        if (info && is_blacklisted(ifnum, &info->iface_blacklist)) {
+                dev_dbg(&serial->dev->dev,
+                        "Ignoring blacklisted interface #%d\n", ifnum);
+                return -ENODEV;
+        }
+        
         /*
          * If this interface supports more than 1 alternate
@@ -168 +212 @@
                 usb_set_interface(udev, ifnum, 1);
         }
-
-        if (ifclass == USB_CLASS_MASS_STORAGE) {
-                /* If TRU-Install support is enabled, force to modem mode */
-                if (truinstall && id->driver_info == DEVICE_INSTALLER) {
-                        dev_dbg(&udev->dev, "%s", "FOUND TRU-INSTALL DEVICE\n");
-                        result = sierra_set_ms_mode(udev, SWIMS_SET_MODE_Modem);
-                }
-                kfree(num_ports);
-                return -EIO;
-        /* Dummy interface present on some SKUs should be ignored */
-        } else if (ifnum == 0x99)
-                *num_ports = 0;
-        else if (numendpoints <= 3)
-                *num_ports = 1;
-        else
-                *num_ports = (numendpoints-1)/2;
-
-        /*
-         * save off our num_ports info so that we can use it in the
-         * calc_num_ports callback
+        /* Be careful here, The ifnum, ifclass etc. might be incorrect, because
+         * of the usb_set_interface call. (all obtained using 
+         * serial->interface->cur_altsetting that was changed by that call)
          */
-        usb_set_serial_data(serial, (void *)num_ports);
-
+        
         return result;
 }
+
+static const struct sierra_device_static_info tru_inst_info = {
+        .dev_type = DEVICE_INSTALLER,
+};
+
+static const u8 direct_ip_non_serial_ifaces[] = { 7, 8, 9, 10, 11 };
+static const struct sierra_device_static_info direct_ip_interface_blacklist = {
+        .dev_type = DEVICE_MODEM,
+        .iface_blacklist = {
+                .listlen = ARRAY_SIZE( direct_ip_non_serial_ifaces ),
+                .list = direct_ip_non_serial_ifaces,
+        },
+};
 
 static struct usb_device_id id_table [] = {
@@ -226 +265 @@
         { USB_DEVICE(0x1199, 0x683A) }, /* Sierra Wireless MC8785 */
         { USB_DEVICE(0x1199, 0x683B) }, /* Sierra Wireless MC8785 Composite */
-        { USB_DEVICE(0x1199, 0x683C) }, /* Sierra Wireless MC8790 */
-        { USB_DEVICE(0x1199, 0x683D) }, /* Sierra Wireless MC8790 */
-        { USB_DEVICE(0x1199, 0x683E) }, /* Sierra Wireless MC8790 */
+        /* Sierra Wireless MC8790, MC8791, MC8792 Composite */
+        { USB_DEVICE(0x1199, 0x683C) }, 
+        { USB_DEVICE(0x1199, 0x683D) }, /* Sierra Wireless MC8791 Composite */
+        /* Sierra Wireless MC8790, MC8791, MC8792 */
+        { USB_DEVICE(0x1199, 0x683E) },
         { USB_DEVICE(0x1199, 0x6850) }, /* Sierra Wireless AirCard 880 */
         { USB_DEVICE(0x1199, 0x6851) }, /* Sierra Wireless AirCard 881 */
@@ -248 +289 @@
         { USB_DEVICE(0x1199, 0x0112) }, /* Sierra Wireless AirCard 580 */
         { USB_DEVICE(0x0F3D, 0x0112) }, /* Airprime/Sierra PC 5220 */
-        { USB_DEVICE(0x1199, 0x68A3) }, /* Sierra Wireless Direct IP modems */
-        { USB_DEVICE(0x05C6, 0x6613) }, /* Onda H600/ZTE MF330 */
-
-        { USB_DEVICE(0x1199, 0x0FFF), .driver_info = DEVICE_INSTALLER},
+
+        { USB_DEVICE(0x1199, 0x0FFF),
+                .driver_info = (kernel_ulong_t)&tru_inst_info
+        },
+        
+        { USB_DEVICE(0x1199, 0x68A3),   /* Sierra Wireless Direct IP modems */
+                .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist 
+        },
+        
         { }
 };
 MODULE_DEVICE_TABLE(usb, id_table);
 
-static struct usb_driver sierra_driver = {
-        .name       = "sierra",
-        .probe      = usb_serial_probe,
-        .disconnect = usb_serial_disconnect,
-        .id_table   = id_table,
-};
-
+/* per port private data */
 struct sierra_port_private {
         spinlock_t lock;        /* lock the structure */
@@ -269 +309 @@
         /* Input endpoints and buffers for this port */
         struct urb *in_urbs[N_IN_URB];
-        char *in_buffer[N_IN_URB];
 
         /* Settings for the port */
@@ -286 +325 @@
         __u16 interface = 0;
 
-        dbg("%s", __FUNCTION__);
+        dev_dbg(&port->dev, "%s\n", __func__);
 
         portdata = usb_get_serial_port_data(port);
 
         if (port->tty) {
+
                 int val = 0;
                 if (portdata->dtr_state)
@@ -296 +336 @@
                 if (portdata->rts_state)
                         val |= 0x02;
-
+                        
                 /* If composite device then properly report interface */
-                if (serial->num_ports == 1)
+                if (serial->num_ports == 1) {
                         interface = sierra_calc_interface(serial);
+                        /* Control message is send only to interfaces with 
+                         * interrupt_in endpoints
+                         */
+                        if(port->interrupt_in_urb) {
+                                /* send control message */
+                                return usb_control_msg(serial->dev,
+                                        usb_rcvctrlpipe(serial->dev, 0),
+                                        0x22, 0x21, val, interface,
+                                        NULL, 0, USB_CTRL_SET_TIMEOUT);
+                        }
+                }
 
                 /* Otherwise the need to do non-composite mapping */
@@ -309 +360 @@
                         else if (port->bulk_out_endpointAddress == 5)
                                 interface = 2;
-                }
-
-                return usb_control_msg(serial->dev,
+
+                        return usb_control_msg(serial->dev,
                                 usb_rcvctrlpipe(serial->dev, 0),
                                 0x22, 0x21, val, interface,
                                 NULL, 0, USB_CTRL_SET_TIMEOUT);
+
+                }
         }
 
@@ -323 +375 @@
                         struct ktermios *old_termios)
 {
-        dev_dbg(&port->dev, "%s", __func__);
+        dev_dbg(&port->dev, "%s\n", __func__);
         sierra_send_setup(port);
 }
@@ -332 +384 @@
         struct sierra_port_private *portdata;
 
+        dev_dbg(&port->dev, "%s\n", __func__);
         portdata = usb_get_serial_port_data(port);
 
@@ -362 +415 @@
         return sierra_send_setup(port);
 }
+static void sierra_release_urb(struct urb *urb)
+{
+        struct usb_serial_port *port;
+        if (urb) {
+                port =  urb->context;
+                dev_dbg(&port->dev, "%s: %p\n", __func__, urb); 
+                if (urb->transfer_buffer)
+                        kfree(urb->transfer_buffer);
+                usb_free_urb(urb);
+        }
+}
 
 static void sierra_outdat_callback(struct urb *urb)
@@ -370 +434 @@
         unsigned long flags;
 
-        dev_dbg(&port->dev, "%s - port %d", __func__, port->number);
+        dev_dbg(&port->dev, "%s - port %d\n", __func__, port->number);
 
         /* free up the transfer buffer, as usb_free_urb() does not do this */
@@ -377 +441 @@
         if (status)
                 dev_dbg(&port->dev, "%s - nonzero write bulk status "
-                    "received: %d", __func__, status);
+                    "received: %d\n", __func__, status);
 
         spin_lock_irqsave(&portdata->lock, flags);
@@ -397 +461 @@
         size_t writesize = min((size_t)count, (size_t)MAX_TRANSFER);
         int retval = 0;
-        
-        if (count==0)
-            return 0;
+
+        /* verify that we actually have some data to write */
+        if (count == 0)
+                return 0;
 
         portdata = usb_get_serial_port_data(port);
 
-        dev_dbg(&port->dev, "%s: write (%d chars)", __func__, count);
+        dev_dbg(&port->dev, "%s: write (%d bytes)\n", __func__, writesize);
 
         spin_lock_irqsave(&portdata->lock, flags);
@@ -428 +493 @@
         }
 
-        memcpy(buffer, buf, writesize);
+        memcpy(buffer, buf, writesize); 
 
         usb_serial_debug_data(debug, &port->dev, __func__, writesize, buffer);
@@ -436 +501 @@
                                           port->bulk_out_endpointAddress),
                           buffer, writesize, sierra_outdat_callback, port);
+
+        /* Handle the need to send a zero length packet */
+        urb->transfer_flags |= URB_ZERO_PACKET;
 
         /* send it down the pipe */
@@ -448 +516 @@
          * really free it when it is finished with it */
         usb_free_urb(urb);
-
+        
         return writesize;
 error:
@@ -470 +538 @@
         int status = urb->status;
 
-        dbg("%s: %p", __func__, urb);
-
         endpoint = usb_pipeendpoint(urb->pipe);
         port =  urb->context;
+        
+        dev_dbg(&port->dev, "%s: %p\n", __func__, urb); 
 
         if (status) {
                 dev_dbg(&port->dev, "%s: nonzero status: %d on"
-                    " endpoint %02x.", __func__, status, endpoint);
+                        " endpoint %02x\n", __func__, status, endpoint);
         } else {
                 tty = port->tty;
@@ -484 +552 @@
                         tty_insert_flip_string(tty, data, urb->actual_length);
                         tty_flip_buffer_push(tty);
+                        usb_serial_debug_data(debug, &port->dev, __func__, 
+                                urb->actual_length, data);
                 } else {
                         dev_dbg(&port->dev, "%s: empty read urb"
-                                " received", __func__);
-                }
-
-                /* Resubmit urb so we continue receiving */
-                if (port->open_count && status != -ESHUTDOWN) {
-                        err = usb_submit_urb(urb, GFP_ATOMIC);
-                        if (err)
-                                dev_err(&port->dev, "resubmit read urb failed."
-                                        "(%d)\n", err);
-                }
-        }
+                                " received\n", __func__);
+                }
+        }
+
+        /* Resubmit urb so we continue receiving */
+        if (port->open_count && status != -ESHUTDOWN && status != -ENOENT) {
+                err = usb_submit_urb(urb, GFP_ATOMIC);
+                if (err)
+                        dev_err(&port->dev, "resubmit read urb failed."
+                                "(%d)\n", err);
+        }
+        
         return;
 }
@@ -508 +579 @@
         struct usb_serial *serial = port->serial;
 
-        dev_dbg(&port->dev, "%s", __func__);
-        dev_dbg(&port->dev, "%s: urb %p port %p has data %p", __func__,
+        dev_dbg(&port->dev, "%s: urb %p port %p has data %p\n", __func__,
                 urb, port, portdata);
 
@@ -528 +598 @@
                                         sizeof(struct usb_ctrlrequest));
 
-                        dev_dbg(&port->dev, "%s: signal x%x", __func__,
+                        dev_dbg(&port->dev, "%s: signal x%x\n", __func__,
                                 signals);
 
@@ -541 +611 @@
                                 tty_hangup(port->tty);
                 } else {
-                        dev_dbg(&port->dev, "%s: type %x req %x",
+                        dev_dbg(&port->dev, "%s: type %x req %x\n",
                                 __func__, req_pkt->bRequestType,
                                 req_pkt->bRequest);
                 }
         } else
-                dev_dbg(&port->dev, "%s: error %d", __func__, status);
+                dev_dbg(&port->dev, "%s: error %d\n", __func__, status);
 
         /* Resubmit urb so we continue receiving IRQ data */
-        if (status != -ESHUTDOWN) {
+        if (port->open_count && status != -ESHUTDOWN && status != -ENOENT) {
                 urb->dev = serial->dev;
                 err = usb_submit_urb(urb, GFP_ATOMIC);
                 if (err)
-                        dev_dbg(&port->dev, "%s: resubmit intr urb "
-                                "failed. (%d)", __func__, err);
+                        dev_err(&port->dev, "%s: resubmit intr urb "
+                                "failed. (%d)\n", __func__, err);
         }
 }
@@ -563 +633 @@
         unsigned long flags;
 
-        dev_dbg(&port->dev, "%s - port %d", __func__, port->number);
+        dev_dbg(&port->dev, "%s - port %d\n", __func__, port->number);
 
         /* try to give a good number back based on if we have any free urbs at
@@ -578 +648 @@
 }
 
+static void sierra_stop_rx_urbs(struct usb_serial_port *port)
+{
+        int i;
+        struct sierra_port_private *portdata = usb_get_serial_port_data(port);
+        
+        for (i = 0; i < ARRAY_SIZE(portdata->in_urbs); i++) {
+                usb_kill_urb(portdata->in_urbs[i]);
+        }
+        usb_kill_urb(port->interrupt_in_urb);
+}
+
+static int sierra_submit_rx_urbs(struct usb_serial_port *port)
+{
+        int ok_cnt;
+        int err = -EINVAL;
+        int i;
+        struct urb * urb;
+        struct sierra_port_private *portdata = usb_get_serial_port_data(port);
+
+        ok_cnt = 0;
+        for (i = 0; i < ARRAY_SIZE(portdata->in_urbs); i++) {
+                urb = portdata->in_urbs[i];
+                if (!urb)
+                        continue;
+                err = usb_submit_urb(urb, GFP_KERNEL);
+                if (err) {
+                        dev_err(&port->dev, "%s: submit urb failed: %d\n",
+                                __func__, err );
+                } else {
+                        ok_cnt ++;
+                }
+        }
+
+        if (ok_cnt && port->interrupt_in_urb) {
+                err = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
+                if (err) {
+                        dev_err(&port->dev, "%s: submit intr urb failed: %d\n",
+                                __func__, err );
+                }
+        }
+
+        if (ok_cnt > 0) /* at least one rx urb submitted */
+                return 0;
+        else
+                return err;
+}
+
+static struct urb *sierra_setup_urb(struct usb_serial *serial, int endpoint,
+                                        int dir, void *ctx, int len,
+                                        usb_complete_t callback)
+{
+        struct urb      *urb;
+        u8              *buf;
+        
+        if (endpoint == -1)
+                return NULL;
+
+        urb = usb_alloc_urb( 0, GFP_KERNEL );
+        if (urb == NULL) {
+                dev_dbg(&serial->dev->dev, "%s: alloc for endpoint %d failed\n", 
+                        __func__, endpoint);
+                return NULL;
+        }
+        
+        buf = kmalloc(len, GFP_KERNEL);
+        if (buf)
+        {
+                /* Fill URB using supplied data */
+                usb_fill_bulk_urb(urb, serial->dev,
+                        usb_sndbulkpipe(serial->dev, endpoint) | dir,
+                        buf, len, callback, ctx);
+
+                /* debug */
+                dev_dbg(&serial->dev->dev,"%s %c u:%p d:%p\n", __func__, 
+                                dir == USB_DIR_IN?'i':'o', urb, buf );
+        } else {
+                dev_dbg(&serial->dev->dev,"%s %c u:%p d:%p\n", __func__, 
+                                dir == USB_DIR_IN?'i':'o', urb, buf );
+
+                sierra_release_urb(urb);
+                urb = NULL;
+        }
+        
+        return urb;
+}
+
+static void sierra_close(struct usb_serial_port *port, struct file *filp)
+{
+        int i;
+        struct usb_serial *serial = port->serial;
+        struct sierra_port_private *portdata;
+
+        dev_dbg(&port->dev, "%s\n", __func__);
+        portdata = usb_get_serial_port_data(port);
+
+        portdata->rts_state = 0;
+        portdata->dtr_state = 0;
+
+        if (serial->dev) {
+                sierra_send_setup(port);
+
+                /* Stop reading urbs */
+                sierra_stop_rx_urbs(port);
+                /* .. and release them */
+                for (i = 0; i < N_IN_URB; i++) {
+                        sierra_release_urb(portdata->in_urbs[i]);
+                        portdata->in_urbs[i] = NULL;
+                }
+        }
+
+        port->tty = NULL;
+}
+
 static int sierra_open(struct usb_serial_port *port, struct file *filp)
 {
@@ -583 +766 @@
         struct usb_serial *serial = port->serial;
         int i;
+        int err;
+        int endpoint;
         struct urb *urb;
-        int result;
 
         portdata = usb_get_serial_port_data(port);
 
-        dev_dbg(&port->dev, "%s", __func__);
+        dev_dbg(&port->dev, "%s\n", __func__);
 
         /* Set some sane defaults */
         portdata->rts_state = 1;
         portdata->dtr_state = 1;
-
-        /* Reset low level data toggle and start reading from endpoints */
-        for (i = 0; i < N_IN_URB; i++) {
-                urb = portdata->in_urbs[i];
-                if (!urb)
-                        continue;
-                if (urb->dev != serial->dev) {
-                        dev_dbg(&port->dev, "%s: dev %p != %p",
-                                 __func__, urb->dev, serial->dev);
-                        continue;
-                }
-
-                /*
-                 * make sure endpoint data toggle is synchronized with the
-                 * device
-                 */
-                usb_clear_halt(urb->dev, urb->pipe);
-
-                result = usb_submit_urb(urb, GFP_KERNEL);
-                if (result) {
-                        dev_err(&port->dev, "submit urb %d failed (%d) %d\n",
-                                i, result, urb->transfer_buffer_length);
-                }
-        }
-
-        port->tty->low_latency = 1;
-
+        
+        if (port->tty) {
+                port->tty->low_latency = 1;
+        }
+
+        spin_lock_init(&portdata->lock);
+        
+        endpoint = port->bulk_in_endpointAddress;
+        
+        for (i = 0; i < ARRAY_SIZE(portdata->in_urbs); i++) {
+                urb = sierra_setup_urb(serial, endpoint, USB_DIR_IN, port,
+                                        IN_BUFLEN, sierra_indat_callback);
+                portdata->in_urbs[i] = urb;
+        }
+        /* clear halt condition */
+        usb_clear_halt(serial->dev, 
+                        usb_sndbulkpipe(serial->dev, endpoint) | USB_DIR_IN);
+                
+        err = sierra_submit_rx_urbs(port);
+        if (err) {
+                /* get rid of everything as in close */
+                sierra_close(port, filp);
+                return err;
+        }
         sierra_send_setup(port);
 
-        /* start up the interrupt endpoint if we have one */
-        if (port->interrupt_in_urb) {
-                result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
-                if (result)
-                        dev_err(&port->dev, "submit irq_in urb failed %d\n",
-                                result);
-        }
         return 0;
-}
-
-static void sierra_close(struct usb_serial_port *port, struct file *filp)
-{
-        int i;
-        struct usb_serial *serial = port->serial;
-        struct sierra_port_private *portdata;
-
-        dev_dbg(&port->dev, "%s", __func__);
-        portdata = usb_get_serial_port_data(port);
-
-        portdata->rts_state = 0;
-        portdata->dtr_state = 0;
-
-        if (serial->dev) {
-                sierra_send_setup(port);
-
-                /* Stop reading/writing urbs */
-                for (i = 0; i < N_IN_URB; i++)
-                        usb_kill_urb(portdata->in_urbs[i]);
-        }
-
-        usb_kill_urb(port->interrupt_in_urb);
-
-        port->tty = NULL;
 }
 
@@ -661 +810 @@
         struct usb_serial_port *port;
         struct sierra_port_private *portdata;
-        struct urb *urb;
         int i;
-        int j;
-
-        dev_dbg(&serial->dev->dev, "%s", __func__);
+
+        dev_dbg(&serial->dev->dev, "%s\n", __func__);
 
         /* Set Device mode to D0 */
@@ -680 +827 @@
                 if (!portdata) {
                         dev_dbg(&port->dev, "%s: kmalloc for "
-                                "sierra_port_private (%d) failed!.",
+                                "sierra_port_private (%d) failed!\n",
                                 __func__, i);
                         return -ENOMEM;
                 }
-                spin_lock_init(&portdata->lock);
-                for (j = 0; j < N_IN_URB; j++) {
-                        portdata->in_buffer[j] = kmalloc(IN_BUFLEN, GFP_KERNEL);
-                        if (!portdata->in_buffer[j]) {
-                                for (--j; j >= 0; j--)
-                                        kfree(portdata->in_buffer[j]);
-                                kfree(portdata);
-                                return -ENOMEM;
-                        }
-                }
-
+                /* Set the port private data pointer */
                 usb_set_serial_port_data(port, portdata);
-
-                /* initialize the in urbs */
-                for (j = 0; j < N_IN_URB; ++j) {
-                        urb = usb_alloc_urb(0, GFP_KERNEL);
-                        if (urb == NULL) {
-                                dev_dbg(&port->dev, "%s: alloc for in "
-                                        "port failed.", __func__);
-                                continue;
-                        }
-                        /* Fill URB using supplied data. */
-                        usb_fill_bulk_urb(urb, serial->dev,
-                                          usb_rcvbulkpipe(serial->dev,
-                                                port->bulk_in_endpointAddress),
-                                          portdata->in_buffer[j], IN_BUFLEN,
-                                          sierra_indat_callback, port);
-                        portdata->in_urbs[j] = urb;
-                }
         }
 
@@ -720 +840 @@
 static void sierra_shutdown(struct usb_serial *serial)
 {
-        int i, j;
+        int i;
         struct usb_serial_port *port;
         struct sierra_port_private *portdata;
 
-        dev_dbg(&serial->dev->dev, "%s", __func__);
+        dev_dbg(&serial->dev->dev, "%s\n", __func__);
 
         for (i = 0; i < serial->num_ports; ++i) {
@@ -733 +853 @@
                 if (!portdata)
                         continue;
-
-                for (j = 0; j < N_IN_URB; j++) {
-                        usb_kill_urb(portdata->in_urbs[j]);
-                        usb_free_urb(portdata->in_urbs[j]);
-                        kfree(portdata->in_buffer[j]);
-                }
                 kfree(portdata);
                 usb_set_serial_port_data(port, NULL);
         }
 }
+
+int sierra_suspend(struct usb_serial *serial, pm_message_t message)
+{
+        int i;
+
+        dev_dbg(&serial->dev->dev, "%s\n", __func__);
+
+        /* The dummy interface doesn't prevent suspended state */
+        if (serial->num_ports == 0)
+                return 0;
+
+        if (!suspend_support)
+                return -EOPNOTSUPP;
+
+        for (i=0; i < serial->num_ports ; i++) {
+                sierra_stop_rx_urbs(serial->port[i]);
+        }
+        return 0;
+}
+
+int sierra_resume(struct usb_serial *serial)
+{
+        int i;
+
+        dev_dbg(&serial->dev->dev, "%s\n", __func__);
+
+        for (i=0; i < serial->num_ports ; i++) {
+                sierra_submit_rx_urbs(serial->port[i]);
+        }
+
+        return 0;
+}
+
+static struct usb_driver sierra_driver = {
+        .name       = "sierra",
+        .probe      = usb_serial_probe,
+        .disconnect = usb_serial_disconnect,
+        .suspend    = usb_serial_suspend,
+        .resume     = usb_serial_resume,
+        .id_table   = id_table,
+
+        .no_dynamic_id        = 1,
+        .supports_autosuspend = 1,
+};
 
 static struct usb_serial_driver sierra_device = {
@@ -767 +925 @@
         .shutdown          = sierra_shutdown,
         .read_int_callback = sierra_instat_callback,
+        .suspend           = sierra_suspend,
+        .resume            = sierra_resume,
 };
 
@@ -814 +974 @@
 module_param(debug, bool, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(debug, "Debug messages");
+
+module_param(suspend_support, bool, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(suspend_support, "Selective Suspend support");