diff -uprN -X linux-2.6.32.3/Documentation/dontdiff linux-2.6.32.3-vanilla/drivers/usb/serial/sierra.c linux-2.6.32.3/drivers/usb/serial/sierra.c --- linux-2.6.32.3-vanilla/drivers/usb/serial/sierra.c 2010-01-06 17:07:45.000000000 -0600 +++ linux-2.6.32.3/drivers/usb/serial/sierra.c 2010-09-02 11:29:36.000000000 -0500 @@ -16,8 +16,13 @@ Portions based on the option driver by Matthias Urlichs Whom based his on the Keyspan driver by Hugh Blemings */ +/* Uncomment to log function calls */ +/* #define DEBUG */ +/* Uncomment to force power level set to auto when attaching a device */ +/* #define POWER_LEVEL_AUTO */ -#define DRIVER_VERSION "v.1.3.8" +/* Sierra driver - kernel 2.6.32 */ +#define DRIVER_VERSION "v.1.7.30" #define DRIVER_AUTHOR "Kevin Lloyd, Elina Pasheva, Matthew Safar, Rory Filer" #define DRIVER_DESC "USB Driver for Sierra Wireless USB modems" @@ -29,12 +34,18 @@ #include #include #include +#include #define SWIMS_USB_REQUEST_SetPower 0x00 +#define SWIMS_USB_REQUEST_GetFwAttr 0x06 #define SWIMS_USB_REQUEST_SetNmea 0x07 +#define USB_REQUEST_TYPE_CLASS 0xA1 +#define USB_REQUEST_IFACE 0x20 -#define N_IN_URB 8 -#define N_OUT_URB 64 +#define N_IN_URB_HM 8 +#define N_OUT_URB_HM 64 +#define N_IN_URB 4 +#define N_OUT_URB 4 #define IN_BUFLEN 4096 #define MAX_TRANSFER (PAGE_SIZE - 512) @@ -42,19 +53,47 @@ allocations > PAGE_SIZE and the number of packets in a page is an integer 512 is the largest possible packet on EHCI */ +#define SWI_FW_ATTR_PM_MASK 0x02 +/* PORTION_LEN defines the length of device attribute buffer */ +#define PORTION_LEN 4096 + static int debug; static int nmea; +/* sysfs attributes */ +static int sierra_create_sysfs_attrs(struct usb_serial_port *port); +static int sierra_remove_sysfs_attrs(struct usb_serial_port *port); + /* Used in interface blacklisting */ struct sierra_iface_info { const u32 infolen; /* number of interface numbers on blacklist */ const u8 *ifaceinfo; /* pointer to the array holding the numbers */ }; +/* per interface statistics */ +struct sierra_intf_stats { + atomic_t rx_bytes; /* received bytes */ + atomic_t indat_cb_cnt; /* indat callback count */ + atomic_t indat_cb_fail; /* indat cb with error */ + + atomic_t tx_bytes; /* transmitted bytes */ + atomic_t write_cnt; /* no. of writes */ + atomic_t write_err; /* no. of failed writes */ + + atomic_t delayed_writes; /* no. of delayed writes */ + atomic_t delayed_write_err; /* no. of delayed write errs */ + + atomic_t outdat_cb_cnt; /* outdat callback count */ + atomic_t outdat_cb_fail; /* outdat cb with error */ + +}; + struct sierra_intf_private { spinlock_t susp_lock; unsigned int suspended:1; int in_flight; + + struct sierra_intf_stats stats; }; static int sierra_set_power_state(struct usb_device *udev, __u16 swiState) @@ -87,6 +126,38 @@ static int sierra_vsc_set_nmea(struct us return result; } +static int sierra_get_fw_attr(struct usb_device *udev, u16 *data) +{ + int result; + u16 *attrdata; + + dev_dbg(&udev->dev, "%s\n", __func__); + + attrdata = kmalloc(sizeof(*attrdata), GFP_KERNEL); + if (!attrdata) + return -ENOMEM; + + result = usb_control_msg(udev, + usb_rcvctrlpipe(udev, 0), + SWIMS_USB_REQUEST_GetFwAttr, /* __u8 request*/ + USB_TYPE_VENDOR | USB_DIR_IN, /* request type*/ + 0x0000, /* __u16 value */ + 0x0000, /* __u16 index */ + attrdata, /* void *data */ + sizeof(*attrdata), /* _u16 size */ + USB_CTRL_SET_TIMEOUT); /* in timeout */ + + if (result < 0) { + kfree(attrdata); + return -EIO; + } + + *data = *attrdata; + + kfree(attrdata); + return result; +} + static int sierra_calc_num_ports(struct usb_serial *serial) { int num_ports = 0; @@ -124,12 +195,28 @@ static int is_blacklisted(const u8 ifnum return 0; } +static int is_himemory(const u8 ifnum, + const struct sierra_iface_info *himemorylist) +{ + const u8 *info; + int i; + + if (himemorylist) { + info = himemorylist->ifaceinfo; + + for (i=0; i < himemorylist->infolen; i++) { + if (info[i] == ifnum) + return 1; + } + } + return 0; +} + static int sierra_calc_interface(struct usb_serial *serial) { int interface; struct usb_interface *p_interface; struct usb_host_interface *p_host_interface; - dev_dbg(&serial->dev->dev, "%s\n", __func__); /* Get the interface structure pointer from the serial struct */ p_interface = serial->interface; @@ -138,8 +225,7 @@ static int sierra_calc_interface(struct p_host_interface = p_interface->cur_altsetting; /* read the interface descriptor for this active altsetting - * to find out the interface number we are on - */ + * to find out the interface number we are on */ interface = p_host_interface->desc.bInterfaceNumber; return interface; @@ -150,13 +236,15 @@ static int sierra_probe(struct usb_seria { int result = 0; struct usb_device *udev; - struct sierra_intf_private *data; + struct sierra_intf_private *intfdata; + int alternate; u8 ifnum; udev = serial->dev; dev_dbg(&udev->dev, "%s\n", __func__); ifnum = sierra_calc_interface(serial); + alternate = 0; /* go with the first */ /* * If this interface supports more than 1 alternate * select the 2nd one @@ -164,9 +252,12 @@ static int sierra_probe(struct usb_seria if (serial->interface->num_altsetting == 2) { dev_dbg(&udev->dev, "Selecting alt setting for interface %d\n", ifnum); - /* We know the alternate setting is 1 for the MC8785 */ - usb_set_interface(udev, ifnum, 1); + /* We know the alternate setting is for composite USB interface + * modems + */ + alternate = 1; } + usb_set_interface(udev, ifnum, alternate); /* ifnum could have changed - by calling usb_set_interface */ ifnum = sierra_calc_interface(serial); @@ -178,17 +269,32 @@ static int sierra_probe(struct usb_seria return -ENODEV; } - data = serial->private = kzalloc(sizeof(struct sierra_intf_private), GFP_KERNEL); - if (!data) + intfdata = serial->private = kzalloc(sizeof(struct sierra_intf_private), + GFP_KERNEL); + if (!intfdata) return -ENOMEM; - spin_lock_init(&data->susp_lock); + spin_lock_init(&intfdata->susp_lock); return result; } +/* interfaces with higher memory requirements */ +static const u8 hi_memory_typeA_ifaces[] = { 0, 2 }; +static const struct sierra_iface_info typeA_interface_list = { + .infolen = ARRAY_SIZE(hi_memory_typeA_ifaces), + .ifaceinfo = hi_memory_typeA_ifaces, +}; + +static const u8 hi_memory_typeB_ifaces[] = { 3, 4, 5, 6 }; +static const struct sierra_iface_info typeB_interface_list = { + .infolen = ARRAY_SIZE(hi_memory_typeB_ifaces), + .ifaceinfo = hi_memory_typeB_ifaces, +}; + +/* 'blacklist' of interfaces not served by this driver */ static const u8 direct_ip_non_serial_ifaces[] = { 7, 8, 9, 10, 11 }; static const struct sierra_iface_info direct_ip_interface_blacklist = { - .infolen = ARRAY_SIZE(direct_ip_non_serial_ifaces), + .infolen = ARRAY_SIZE( direct_ip_non_serial_ifaces ), .ifaceinfo = direct_ip_non_serial_ifaces, }; @@ -240,7 +346,7 @@ static struct usb_device_id id_table [] { USB_DEVICE(0x1199, 0x683A) }, /* Sierra Wireless MC8785 */ { USB_DEVICE(0x1199, 0x683B) }, /* Sierra Wireless MC8785 Composite */ /* Sierra Wireless MC8790, MC8791, MC8792 Composite */ - { USB_DEVICE(0x1199, 0x683C) }, + { USB_DEVICE(0x1199, 0x683C) }, { USB_DEVICE(0x1199, 0x683D) }, /* Sierra Wireless MC8791 Composite */ /* Sierra Wireless MC8790, MC8791, MC8792 */ { USB_DEVICE(0x1199, 0x683E) }, @@ -261,33 +367,27 @@ static struct usb_device_id id_table [] /* Sierra Wireless HSPA Non-Composite Device */ { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6892, 0xFF, 0xFF, 0xFF)}, { USB_DEVICE(0x1199, 0x6893) }, /* Sierra Wireless Device */ - { USB_DEVICE(0x1199, 0x68A3), /* Sierra Wireless Direct IP modems */ - .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist + /* Sierra Wireless Direct IP modems */ + { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x68A3, 0xFF, 0xFF, 0xFF), + .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, - .suspend = usb_serial_suspend, - .resume = usb_serial_resume, - .id_table = id_table, - .no_dynamic_id = 1, - .supports_autosuspend = 1, -}; - +/* per port private data */ struct sierra_port_private { spinlock_t lock; /* lock the structure */ int outstanding_urbs; /* number of out urbs in flight */ + struct usb_anchor active; struct usb_anchor delayed; + int num_out_urbs; + int num_in_urbs; /* Input endpoints and buffers for this port */ - struct urb *in_urbs[N_IN_URB]; + struct urb *in_urbs[N_IN_URB_HM]; /* Settings for the port */ int rts_state; /* Handshaking pins (outputs) */ @@ -302,7 +402,7 @@ struct sierra_port_private { static int sierra_send_setup(struct usb_serial_port *port) { struct usb_serial *serial = port->serial; - struct sierra_port_private *portdata; + struct sierra_port_private *portdata = usb_get_serial_port_data(port); __u16 interface = 0; int val = 0; int do_send = 0; @@ -310,8 +410,6 @@ static int sierra_send_setup(struct usb_ dev_dbg(&port->dev, "%s\n", __func__); - portdata = usb_get_serial_port_data(port); - if (portdata->dtr_state) val |= 0x01; if (portdata->rts_state) @@ -404,11 +502,77 @@ static void sierra_release_urb(struct ur if (urb) { port = urb->context; dev_dbg(&port->dev, "%s: %p\n", __func__, urb); - kfree(urb->transfer_buffer); usb_free_urb(urb); } } +/* Sysfs Attributes */ + +static ssize_t show_suspend_status(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct usb_serial_port *port; + struct sierra_port_private *portdata; + struct sierra_intf_private *intfdata; + unsigned long flags; + unsigned int flag_suspended = 0; + + port = to_usb_serial_port(dev); + portdata = usb_get_serial_port_data(port); + intfdata = port->serial->private; + + spin_lock_irqsave(&intfdata->susp_lock, flags); + flag_suspended = intfdata->suspended; + spin_unlock_irqrestore(&intfdata->susp_lock, flags); + + return snprintf(buf, PORTION_LEN, "%i\n", flag_suspended); +} + +static ssize_t show_stats(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct usb_serial_port *port; + struct sierra_intf_private *intfdata; + + port = to_usb_serial_port(dev); + intfdata = port->serial->private; + + return snprintf(buf, PORTION_LEN, + "rx: %i B\tindat: %i\tindat err: %i\n" + "tx: %i B\toutdat: %i\toutdat err: %i\n" + "writes: %i\t\twrite err: %i\n" + "delayed writes: %i\tdelayed write err: %i\n", + atomic_read(&intfdata->stats.rx_bytes), atomic_read(&intfdata->stats.indat_cb_cnt), atomic_read(&intfdata->stats.indat_cb_fail), + atomic_read(&intfdata->stats.tx_bytes), atomic_read(&intfdata->stats.outdat_cb_cnt), atomic_read(&intfdata->stats.outdat_cb_fail), + atomic_read(&intfdata->stats.write_cnt), atomic_read(&intfdata->stats.write_err), + atomic_read(&intfdata->stats.delayed_writes), atomic_read(&intfdata->stats.delayed_write_err) + ); +} + +/* Read only suspend status */ +static DEVICE_ATTR(suspend_status, S_IWUSR | S_IRUGO, show_suspend_status, + NULL); + +/* Read only statistics */ +static DEVICE_ATTR(stats, S_IWUSR | S_IRUGO, show_stats, NULL); + +static int sierra_create_sysfs_attrs(struct usb_serial_port *port) +{ + int result = 0; + + result = device_create_file(&port->dev, &dev_attr_stats); + if (unlikely (result < 0)) + return result; + return device_create_file(&port->dev, &dev_attr_suspend_status); +} + +static int sierra_remove_sysfs_attrs(struct usb_serial_port *port) +{ + device_remove_file(&port->dev, &dev_attr_stats); + device_remove_file(&port->dev, &dev_attr_suspend_status); + return 0; +} + static void sierra_outdat_callback(struct urb *urb) { struct usb_serial_port *port = urb->context; @@ -419,16 +583,20 @@ static void sierra_outdat_callback(struc dev_dbg(&port->dev, "%s - port %d\n", __func__, port->number); intfdata = port->serial->private; - /* free up the transfer buffer, as usb_free_urb() does not do this */ - kfree(urb->transfer_buffer); usb_autopm_put_interface_async(port->serial->interface); - if (status) + + atomic_inc(&intfdata->stats.outdat_cb_cnt); + + if (status) { dev_dbg(&port->dev, "%s - nonzero write bulk status " "received: %d\n", __func__, status); + atomic_inc(&intfdata->stats.outdat_cb_fail); + } spin_lock(&portdata->lock); --portdata->outstanding_urbs; spin_unlock(&portdata->lock); + spin_lock(&intfdata->susp_lock); --intfdata->in_flight; spin_unlock(&intfdata->susp_lock); @@ -437,8 +605,9 @@ static void sierra_outdat_callback(struc } /* Write */ -static int sierra_write(struct tty_struct *tty, struct usb_serial_port *port, - const unsigned char *buf, int count) +static int sierra_write(struct tty_struct *tty, + struct usb_serial_port *port, + const unsigned char *buf, int count) { struct sierra_port_private *portdata = usb_get_serial_port_data(port); struct sierra_intf_private *intfdata; @@ -453,46 +622,49 @@ static int sierra_write(struct tty_struc if (count == 0) return 0; - portdata = usb_get_serial_port_data(port); + dev_dbg(&port->dev, "%s: write (%zu bytes)\n", __func__, writesize); + intfdata = serial->private; - dev_dbg(&port->dev, "%s: write (%zd bytes)\n", __func__, writesize); spin_lock_irqsave(&portdata->lock, flags); - dev_dbg(&port->dev, "%s - outstanding_urbs: %d\n", __func__, - portdata->outstanding_urbs); - if (portdata->outstanding_urbs > N_OUT_URB) { + if (portdata->outstanding_urbs > portdata->num_out_urbs) { spin_unlock_irqrestore(&portdata->lock, flags); dev_dbg(&port->dev, "%s - write limit hit\n", __func__); return 0; } portdata->outstanding_urbs++; - dev_dbg(&port->dev, "%s - 1, outstanding_urbs: %d\n", __func__, - portdata->outstanding_urbs); spin_unlock_irqrestore(&portdata->lock, flags); retval = usb_autopm_get_interface_async(serial->interface); - if (retval < 0) { + if (unlikely(retval < 0)) { spin_lock_irqsave(&portdata->lock, flags); portdata->outstanding_urbs--; spin_unlock_irqrestore(&portdata->lock, flags); - goto error_simple; + return retval; } buffer = kmalloc(writesize, GFP_ATOMIC); if (!buffer) { dev_err(&port->dev, "out of memory\n"); - retval = -ENOMEM; - goto error_no_buffer; + spin_lock_irqsave(&portdata->lock, flags); + --portdata->outstanding_urbs; + spin_unlock_irqrestore(&portdata->lock, flags); + usb_autopm_put_interface_async(serial->interface); + return -ENOMEM; } urb = usb_alloc_urb(0, GFP_ATOMIC); if (!urb) { dev_err(&port->dev, "no more free urbs\n"); - retval = -ENOMEM; - goto error_no_urb; + kfree(buffer); + spin_lock_irqsave(&portdata->lock, flags); + --portdata->outstanding_urbs; + spin_unlock_irqrestore(&portdata->lock, flags); + usb_autopm_put_interface_async(serial->interface); + return -ENOMEM; } - memcpy(buffer, buf, writesize); + memcpy(buffer, buf, writesize); usb_serial_debug_data(debug, &port->dev, __func__, writesize, buffer); @@ -501,80 +673,91 @@ static int sierra_write(struct tty_struc 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; + /* Handle the need to send a zero length packet and release the + * transfer buffer + */ + urb->transfer_flags |= (URB_ZERO_PACKET | URB_FREE_BUFFER); spin_lock_irqsave(&intfdata->susp_lock, flags); if (intfdata->suspended) { usb_anchor_urb(urb, &portdata->delayed); spin_unlock_irqrestore(&intfdata->susp_lock, flags); - goto skip_power; - } else { - usb_anchor_urb(urb, &portdata->active); + /* release our reference to this urb, the USB core will + * eventually free it entirely */ + usb_free_urb(urb); + return writesize; } + usb_anchor_urb(urb, &portdata->active); + /* send it down the pipe */ retval = usb_submit_urb(urb, GFP_ATOMIC); if (retval) { usb_unanchor_urb(urb); spin_unlock_irqrestore(&intfdata->susp_lock, flags); + dev_err(&port->dev, "%s - usb_submit_urb(write bulk) failed " "with status = %d\n", __func__, retval); - goto error; + usb_free_urb(urb); + spin_lock_irqsave(&portdata->lock, flags); + --portdata->outstanding_urbs; + spin_unlock_irqrestore(&portdata->lock, flags); + usb_autopm_put_interface_async(serial->interface); + atomic_inc(&intfdata->stats.write_err); + return retval; } else { intfdata->in_flight++; spin_unlock_irqrestore(&intfdata->susp_lock, flags); + atomic_inc(&intfdata->stats.write_cnt); + atomic_add(writesize, &intfdata->stats.tx_bytes); } - -skip_power: - /* we are done with this urb, so let the host driver - * really free it when it is finished with it */ - usb_free_urb(urb); + /* release our reference to this urb, the USB core will eventually + * free it entirely */ + usb_free_urb(urb); return writesize; -error: - usb_free_urb(urb); -error_no_urb: - kfree(buffer); -error_no_buffer: - spin_lock_irqsave(&portdata->lock, flags); - --portdata->outstanding_urbs; - dev_dbg(&port->dev, "%s - 2. outstanding_urbs: %d\n", __func__, - portdata->outstanding_urbs); - spin_unlock_irqrestore(&portdata->lock, flags); - usb_autopm_put_interface_async(serial->interface); -error_simple: - return retval; } static void sierra_indat_callback(struct urb *urb) { int err; int endpoint; - struct usb_serial_port *port; + struct usb_serial_port *port = urb->context; struct tty_struct *tty; + struct sierra_intf_private *intfdata; unsigned char *data = urb->transfer_buffer; int status = urb->status; endpoint = usb_pipeendpoint(urb->pipe); - port = urb->context; dev_dbg(&port->dev, "%s: %p\n", __func__, urb); + intfdata = port->serial->private; + + atomic_inc(&intfdata->stats.indat_cb_cnt); /* indat calls */ + if (status) { dev_dbg(&port->dev, "%s: nonzero status: %d on" " endpoint %02x\n", __func__, status, endpoint); + atomic_inc(&intfdata->stats.indat_cb_fail); /* indat fails */ } else { if (urb->actual_length) { tty = tty_port_tty_get(&port->port); - - tty_buffer_request_room(tty, urb->actual_length); - tty_insert_flip_string(tty, data, urb->actual_length); - tty_flip_buffer_push(tty); - - tty_kref_put(tty); - usb_serial_debug_data(debug, &port->dev, __func__, - urb->actual_length, data); + if (tty) { + tty_buffer_request_room(tty, + urb->actual_length); + tty_insert_flip_string(tty, data, + urb->actual_length); + tty_flip_buffer_push(tty); + + tty_kref_put(tty); + /* tty invalid after this point */ + /* rx'd bytes */ + atomic_add(urb->actual_length, + &intfdata->stats.rx_bytes); + usb_serial_debug_data(debug, &port->dev, + __func__, urb->actual_length, data); + } } else { dev_dbg(&port->dev, "%s: empty read urb" " received\n", __func__); @@ -582,10 +765,11 @@ static void sierra_indat_callback(struct } /* Resubmit urb so we continue receiving */ - if (port->port.count && status != -ESHUTDOWN && status != -EPERM) { + if (port->port.count && + status != -ESHUTDOWN && status != -ENOENT && status != -ENODEV) { usb_mark_last_busy(port->serial->dev); err = usb_submit_urb(urb, GFP_ATOMIC); - if (err) + if (err && err != -ENODEV) dev_err(&port->dev, "resubmit read urb failed." "(%d)\n", err); } @@ -601,31 +785,29 @@ static void sierra_instat_callback(struc struct sierra_port_private *portdata = usb_get_serial_port_data(port); struct usb_serial *serial = port->serial; - dev_dbg(&port->dev, "%s: urb %p port %p has data %p\n", __func__, - urb, port, portdata); + dev_dbg(&port->dev, "%s: %p\n", __func__, urb); if (status == 0) { struct usb_ctrlrequest *req_pkt = (struct usb_ctrlrequest *)urb->transfer_buffer; - if (!req_pkt) { - dev_dbg(&port->dev, "%s: NULL req_pkt\n", - __func__); - return; - } - if ((req_pkt->bRequestType == 0xA1) && - (req_pkt->bRequest == 0x20)) { + const u16 *sigp = (u16 *)(req_pkt + 1); + /* usb_ctrlrequest we parsed is followed by two bytes of data + * make sure we received that many bytes + */ + if (urb->actual_length >= sizeof(*req_pkt) + sizeof(*sigp) && + req_pkt->bRequestType == USB_REQUEST_TYPE_CLASS && + req_pkt->bRequest == USB_REQUEST_IFACE) { int old_dcd_state; - unsigned char signals = *((unsigned char *) - urb->transfer_buffer + - sizeof(struct usb_ctrlrequest)); + const u16 signals = get_unaligned_le16(sigp); struct tty_struct *tty; - dev_dbg(&port->dev, "%s: signal x%x\n", __func__, + dev_dbg(&port->dev, "%s: signal 0x%x\n", __func__, signals); old_dcd_state = portdata->dcd_state; - portdata->cts_state = 1; + /* Note: CTS from modem is in reverse logic! */ + portdata->cts_state = ((signals & 0x100) ? 0 : 1); portdata->dcd_state = ((signals & 0x01) ? 1 : 0); portdata->dsr_state = ((signals & 0x02) ? 1 : 0); portdata->ri_state = ((signals & 0x08) ? 1 : 0); @@ -636,19 +818,20 @@ static void sierra_instat_callback(struc tty_hangup(tty); tty_kref_put(tty); } else { - dev_dbg(&port->dev, "%s: type %x req %x\n", - __func__, req_pkt->bRequestType, - req_pkt->bRequest); + /* dump the data we don't understand to log */ + usb_serial_debug_data(1, &port->dev, __func__, + urb->actual_length, urb->transfer_buffer); } } else dev_dbg(&port->dev, "%s: error %d\n", __func__, status); /* Resubmit urb so we continue receiving IRQ data */ - if (port->port.count && status != -ESHUTDOWN && status != -ENOENT) { + if (port->port.count && + status != -ESHUTDOWN && status != -ENOENT && status != -ENODEV) { usb_mark_last_busy(serial->dev); urb->dev = serial->dev; err = usb_submit_urb(urb, GFP_ATOMIC); - if (err) + if (err && err != -ENODEV) dev_err(&port->dev, "%s: resubmit intr urb " "failed. (%d)\n", __func__, err); } @@ -659,20 +842,21 @@ static int sierra_write_room(struct tty_ struct usb_serial_port *port = tty->driver_data; struct sierra_port_private *portdata = usb_get_serial_port_data(port); unsigned long flags; + int retval; 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 * this point in time */ + retval = MAX_TRANSFER; + spin_lock_irqsave(&portdata->lock, flags); - if (portdata->outstanding_urbs > N_OUT_URB * 2 / 3) { - spin_unlock_irqrestore(&portdata->lock, flags); - dev_dbg(&port->dev, "%s - write limit hit\n", __func__); - return 0; + if (portdata->outstanding_urbs >= portdata->num_out_urbs) { + retval = 0; } spin_unlock_irqrestore(&portdata->lock, flags); - return 2048; + return retval; } static void sierra_stop_rx_urbs(struct usb_serial_port *port) @@ -680,7 +864,7 @@ static void sierra_stop_rx_urbs(struct u int i; struct sierra_port_private *portdata = usb_get_serial_port_data(port); - for (i = 0; i < ARRAY_SIZE(portdata->in_urbs); i++) + for (i = 0; i < portdata->num_in_urbs; i++) usb_kill_urb(portdata->in_urbs[i]); usb_kill_urb(port->interrupt_in_urb); @@ -695,10 +879,11 @@ static int sierra_submit_rx_urbs(struct struct sierra_port_private *portdata = usb_get_serial_port_data(port); ok_cnt = 0; - for (i = 0; i < ARRAY_SIZE(portdata->in_urbs); i++) { + for (i = 0; i < portdata->num_in_urbs; i++) { urb = portdata->in_urbs[i]; if (!urb) continue; + urb->transfer_flags |= URB_FREE_BUFFER; err = usb_submit_urb(urb, mem_flags); if (err) { dev_err(&port->dev, "%s: submit urb failed: %d\n", @@ -760,41 +945,46 @@ static struct urb *sierra_setup_urb(stru return urb; } - static void sierra_close(struct usb_serial_port *port) { int i; + struct urb *urb; struct usb_serial *serial = port->serial; struct sierra_port_private *portdata; struct sierra_intf_private *intfdata = port->serial->private; - dev_dbg(&port->dev, "%s\n", __func__); portdata = usb_get_serial_port_data(port); portdata->rts_state = 0; portdata->dtr_state = 0; + usb_autopm_get_interface(serial->interface); + if (serial->dev) { mutex_lock(&serial->disc_mutex); - if (!serial->disconnected) { - serial->interface->needs_remote_wakeup = 0; - usb_autopm_get_interface(serial->interface); + if (!serial->disconnected) sierra_send_setup(port); - } mutex_unlock(&serial->disc_mutex); spin_lock_irq(&intfdata->susp_lock); portdata->opened = 0; spin_unlock_irq(&intfdata->susp_lock); - /* Stop reading urbs */ sierra_stop_rx_urbs(port); /* .. and release them */ - for (i = 0; i < N_IN_URB; i++) { + for (i = 0; i < portdata->num_in_urbs; i++) { sierra_release_urb(portdata->in_urbs[i]); portdata->in_urbs[i] = NULL; } + while((urb = usb_get_from_anchor(&portdata->delayed))) { + sierra_release_urb(urb); + usb_autopm_put_interface(serial->interface); + } + /* wait for active to finish */ + usb_wait_anchor_empty_timeout(&portdata->active, 500); + usb_kill_anchored_urbs(&portdata->active); + } } @@ -818,7 +1008,7 @@ static int sierra_open(struct tty_struct endpoint = port->bulk_in_endpointAddress; - for (i = 0; i < ARRAY_SIZE(portdata->in_urbs); i++) { + for (i = 0; i < portdata->num_in_urbs; i++) { urb = sierra_setup_urb(serial, endpoint, USB_DIR_IN, port, IN_BUFLEN, GFP_KERNEL, sierra_indat_callback); @@ -828,6 +1018,11 @@ static int sierra_open(struct tty_struct usb_clear_halt(serial->dev, usb_sndbulkpipe(serial->dev, endpoint) | USB_DIR_IN); + /* reset outstanding out urbs counter */ + spin_lock_irq(&portdata->lock); + portdata->outstanding_urbs = 0; + spin_unlock_irq(&portdata->lock); + err = sierra_submit_rx_urbs(port, GFP_KERNEL); if (err) { /* get rid of everything as in close */ @@ -838,7 +1033,6 @@ static int sierra_open(struct tty_struct } sierra_send_setup(port); - serial->interface->needs_remote_wakeup = 1; spin_lock_irq(&intfdata->susp_lock); portdata->opened = 1; spin_unlock_irq(&intfdata->susp_lock); @@ -847,7 +1041,6 @@ static int sierra_open(struct tty_struct return 0; } - static void sierra_dtr_rts(struct usb_serial_port *port, int on) { struct usb_serial *serial = port->serial; @@ -867,9 +1060,13 @@ static void sierra_dtr_rts(struct usb_se static int sierra_startup(struct usb_serial *serial) { - struct usb_serial_port *port; - struct sierra_port_private *portdata; + struct usb_serial_port *port = NULL; + struct sierra_port_private *portdata = NULL; + struct sierra_iface_info *himemoryp = NULL; int i; + u8 ifnum; + u16 fw_attr; + int result; dev_dbg(&serial->dev->dev, "%s\n", __func__); @@ -880,22 +1077,80 @@ static int sierra_startup(struct usb_ser if (nmea) sierra_vsc_set_nmea(serial->dev, 1); - /* Now setup per port private data */ - for (i = 0; i < serial->num_ports; i++) { - port = serial->port[i]; - portdata = kzalloc(sizeof(*portdata), GFP_KERNEL); + if (serial->num_ports) { + /* Note: One big piece of memory is allocated for all ports + * private data in one shot. This memory is split into equal + * pieces for each port. + */ + portdata = (struct sierra_port_private *)kzalloc + (sizeof(*portdata) * serial->num_ports, GFP_KERNEL); if (!portdata) { - dev_dbg(&port->dev, "%s: kmalloc for " - "sierra_port_private (%d) failed!.\n", - __func__, i); + dev_dbg(&serial->dev->dev, "%s: No memory!\n", __func__); return -ENOMEM; } + } + + /* Now setup per port private data */ + for (i = 0; i < serial->num_ports; i++, portdata++) { + port = serial->port[i]; + /* Initialize selected members of private data because these + * may be referred to right away */ spin_lock_init(&portdata->lock); init_usb_anchor(&portdata->active); init_usb_anchor(&portdata->delayed); + + portdata->cts_state = 1; + + ifnum = i; + /* Assume low memory requirements */ + portdata->num_out_urbs = N_OUT_URB; + portdata->num_in_urbs = N_IN_URB; + + /* Determine actual memory requirements */ + if (serial->num_ports == 1) { + /* Get interface number for composite device */ + ifnum = sierra_calc_interface(serial); + himemoryp = + (struct sierra_iface_info *)&typeB_interface_list; + if (is_himemory(ifnum, himemoryp)) { + portdata->num_out_urbs = N_OUT_URB_HM; + portdata->num_in_urbs = N_IN_URB_HM; + } + } + else { + himemoryp = + (struct sierra_iface_info *)&typeA_interface_list; + if (is_himemory(i, himemoryp)) { + portdata->num_out_urbs = N_OUT_URB_HM; + portdata->num_in_urbs = N_IN_URB_HM; + } + } + dev_dbg(&serial->dev->dev, + "Memory usage (urbs) interface #%d, in=%d, out=%d\n", + ifnum,portdata->num_in_urbs, portdata->num_out_urbs ); /* Set the port private data pointer */ usb_set_serial_port_data(port, portdata); } + serial->interface->needs_remote_wakeup = 1; + usb_autopm_disable(serial->interface); + + result = sierra_get_fw_attr(serial->dev, &fw_attr); + if (result == sizeof(fw_attr) && (fw_attr & SWI_FW_ATTR_PM_MASK) ) { + dev_info(&serial->dev->dev, + "APM supported, enabling autosuspend.\n"); + usb_autopm_enable(serial->interface); +/******************************************************************************* + * If you want the default /sys/bus/usb/devices/.../.../power/level to be forced + * to auto, the following needs to be compiled in. + * Other combinations may be used for other default values (see + * drivers/usb/core/sysfs.c function set_level. + */ +#ifdef POWER_LEVEL_AUTO + /* make power level default be 'auto' */ + serial->dev->autoresume_disabled = 0; + serial->dev->autosuspend_disabled = 0; +#endif + } return 0; } @@ -904,19 +1159,29 @@ static void sierra_release(struct usb_se { int i; struct usb_serial_port *port; - struct sierra_port_private *portdata; + struct sierra_intf_private *intfdata = serial->private; dev_dbg(&serial->dev->dev, "%s\n", __func__); + if (serial->num_ports > 0) { + port = serial->port[0]; + if (port) + /* Note: The entire piece of memory that was allocated + * in the startup routine can be released by passing + * a pointer to the beginning of the piece. + * This address corresponds to the address of the chunk + * that was given to port 0. + */ + kfree(usb_get_serial_port_data(port)); + } + for (i = 0; i < serial->num_ports; ++i) { port = serial->port[i]; if (!port) continue; - portdata = usb_get_serial_port_data(port); - if (!portdata) - continue; - kfree(portdata); + usb_set_serial_port_data(port, NULL); } + kfree(intfdata); } #ifdef CONFIG_PM @@ -938,21 +1203,21 @@ static void stop_read_write_urbs(struct static int sierra_suspend(struct usb_serial *serial, pm_message_t message) { struct sierra_intf_private *intfdata; - int b; - if (serial->dev->auto_pm) { - intfdata = serial->private; - spin_lock_irq(&intfdata->susp_lock); - b = intfdata->in_flight; + dev_dbg(&serial->dev->dev, "%s\n", __func__); + + intfdata = serial->private; + spin_lock_irq(&intfdata->susp_lock); - if (b) { + if (serial->dev->auto_pm) { + if (intfdata->in_flight) { spin_unlock_irq(&intfdata->susp_lock); return -EBUSY; - } else { - intfdata->suspended = 1; - spin_unlock_irq(&intfdata->susp_lock); } } + intfdata->suspended = 1; + spin_unlock_irq(&intfdata->susp_lock); + stop_read_write_urbs(serial); return 0; @@ -966,22 +1231,35 @@ static int sierra_resume(struct usb_seri struct urb *urb; int ec = 0; int i, err; + int len; + int failed_submits; + dev_dbg(&serial->dev->dev, "%s\n", __func__); + spin_lock_irq(&intfdata->susp_lock); for (i = 0; i < serial->num_ports; i++) { port = serial->port[i]; portdata = usb_get_serial_port_data(port); - + failed_submits = 0; while ((urb = usb_get_from_anchor(&portdata->delayed))) { usb_anchor_urb(urb, &portdata->active); intfdata->in_flight++; + len = urb->transfer_buffer_length; err = usb_submit_urb(urb, GFP_ATOMIC); if (err < 0) { intfdata->in_flight--; usb_unanchor_urb(urb); - usb_scuttle_anchored_urbs(&portdata->delayed); - break; + failed_submits++; + atomic_inc(&intfdata->stats.delayed_write_err); + /* fix pm_usage_cnt */ + usb_autopm_put_interface_async( + port->serial->interface); + } else { + atomic_inc(&intfdata->stats.delayed_writes); + atomic_add(len, &intfdata->stats.tx_bytes); } + /* release urb - usb_get_from_anchor increased kref */ + usb_free_urb(urb); } if (portdata->opened) { @@ -989,6 +1267,14 @@ static int sierra_resume(struct usb_seri if (err) ec++; } + if (failed_submits) { + /* fix outstanding_urbs counter */ + spin_lock(&portdata->lock); /* assuming irq disabled */ + portdata->outstanding_urbs -= failed_submits; + spin_unlock(&portdata->lock); + /* unblock a writer */ + usb_serial_port_softint(port); + } } intfdata->suspended = 0; spin_unlock_irq(&intfdata->susp_lock); @@ -1000,6 +1286,27 @@ static int sierra_resume(struct usb_seri #define sierra_resume NULL #endif +static int sierra_reset_resume(struct usb_interface *intf) +{ + struct usb_serial *serial = usb_get_intfdata(intf); + dev_err(&serial->dev->dev, "%s\n", __func__); + return usb_serial_resume(intf); +} + +static struct usb_driver sierra_driver = { + .name = "sierra", + .probe = usb_serial_probe, + .disconnect = usb_serial_disconnect, + .suspend = usb_serial_suspend, + .resume = usb_serial_resume, + .reset_resume = sierra_reset_resume, + .id_table = id_table, + + .no_dynamic_id = 1, + .supports_autosuspend = 1, +}; + + static struct usb_serial_driver sierra_device = { .driver = { .owner = THIS_MODULE, @@ -1020,9 +1327,12 @@ static struct usb_serial_driver sierra_d .tiocmset = sierra_tiocmset, .attach = sierra_startup, .release = sierra_release, - .suspend = sierra_suspend, - .resume = sierra_resume, + .port_probe = sierra_create_sysfs_attrs, + .port_remove = sierra_remove_sysfs_attrs, + .suspend = sierra_suspend, + .resume = sierra_resume, .read_int_callback = sierra_instat_callback, + }; /* Functions used by new usb-serial code. */ @@ -1033,7 +1343,6 @@ static int __init sierra_init(void) if (retval) goto failed_device_register; - retval = usb_register(&sierra_driver); if (retval) goto failed_driver_register;