1 files changed, 79 insertions, 91 deletions

diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index 2f6f1523ec56..706033753adb 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -14,7 +14,7 @@
   Whom based his on the Keyspan driver by Hugh Blemings <hugh@blemings.org>
 */
 
-#define DRIVER_VERSION "v.1.2.9c"
+#define DRIVER_VERSION "v.1.2.13a"
 #define DRIVER_AUTHOR "Kevin Lloyd <klloyd@sierrawireless.com>"
 #define DRIVER_DESC "USB Driver for Sierra Wireless USB modems"
 
@@ -31,6 +31,7 @@
 #define SWIMS_USB_REQUEST_SetPower      0x00
 #define SWIMS_USB_REQUEST_SetNmea       0x07
 #define SWIMS_USB_REQUEST_SetMode       0x0B
+#define SWIMS_USB_REQUEST_GetSwocInfo   0x0A
 #define SWIMS_SET_MODE_Modem            0x0001
 
 /* per port private data */
@@ -40,18 +41,11 @@
 
 static int debug;
 static int nmea;
-static int truinstall = 1;
-
-enum devicetype {
-        DEVICE_3_PORT =         0,
-        DEVICE_1_PORT =         1,
-        DEVICE_INSTALLER =      2,
-};
 
 static int sierra_set_power_state(struct usb_device *udev, __u16 swiState)
 {
         int result;
-        dev_dbg(&udev->dev, "%s", "SET POWER STATE\n");
+        dev_dbg(&udev->dev, "%s", __func__);
         result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
                         SWIMS_USB_REQUEST_SetPower,     /* __u8 request      */
                         USB_TYPE_VENDOR,                /* __u8 request type */
@@ -63,25 +57,10 @@ static int sierra_set_power_state(struct usb_device *udev, __u16 swiState)
         return result;
 }
 
-static int sierra_set_ms_mode(struct usb_device *udev, __u16 eSWocMode)
-{
-        int result;
-        dev_dbg(&udev->dev, "%s", "DEVICE MODE SWITCH\n");
-        result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
-                        SWIMS_USB_REQUEST_SetMode,      /* __u8 request      */
-                        USB_TYPE_VENDOR,                /* __u8 request type */
-                        eSWocMode,                      /* __u16 value       */
-                        0x0000,                         /* __u16 index       */
-                        NULL,                           /* void *data        */
-                        0,                              /* __u16 size        */
-                        USB_CTRL_SET_TIMEOUT);          /* int timeout       */
-        return result;
-}
-
 static int sierra_vsc_set_nmea(struct usb_device *udev, __u16 enable)
 {
         int result;
-        dev_dbg(&udev->dev, "%s", "NMEA Enable sent\n");
+        dev_dbg(&udev->dev, "%s", __func__);
         result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
                         SWIMS_USB_REQUEST_SetNmea,      /* __u8 request      */
                         USB_TYPE_VENDOR,                /* __u8 request type */
@@ -97,6 +76,7 @@ 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;
 
@@ -110,22 +90,23 @@ static int sierra_calc_num_ports(struct usb_serial *serial)
 
 static int sierra_calc_interface(struct usb_serial *serial)
 {
-                int interface;
-                struct usb_interface *p_interface;
-                struct usb_host_interface *p_host_interface;
+        int interface;
+        struct usb_interface *p_interface;
+        struct usb_host_interface *p_host_interface;
+        dev_dbg(&serial->dev->dev, "%s", __func__);
 
-                /* Get the interface structure pointer from the serial struct */
-                p_interface = serial->interface;
+        /* Get the interface structure pointer from the serial struct */
+        p_interface = serial->interface;
 
-                /* Get a pointer to the host interface structure */
-                p_host_interface = p_interface->cur_altsetting;
+        /* Get a pointer to the host interface structure */
+        p_host_interface = p_interface->cur_altsetting;
 
-                /* read the interface descriptor for this active altsetting
-                 * to find out the interface number we are on
-                */
-                interface = p_host_interface->desc.bInterfaceNumber;
+        /* read the interface descriptor for this active altsetting
+         * to find out the interface number we are on
+        */
+        interface = p_host_interface->desc.bInterfaceNumber;
 
-                return interface;
+        return interface;
 }
 
 static int sierra_probe(struct usb_serial *serial,
@@ -135,43 +116,40 @@ static int sierra_probe(struct usb_serial *serial,
         struct usb_device *udev;
         int *num_ports;
         u8 ifnum;
+        u8 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;
+        numendpoints = serial->interface->cur_altsetting->desc.bNumEndpoints;
         udev = serial->dev;
 
-                /* Figure out the interface number from the serial structure */
-                ifnum = sierra_calc_interface(serial);
-
-                /*
-                 * If this interface supports more than 1 alternate
-                 * select the 2nd one
-                 */
-                if (serial->interface->num_altsetting == 2) {
-                        dev_dbg(&udev->dev,
-                                "Selecting alt setting for interface %d\n",
-                                ifnum);
+        /* Figure out the interface number from the serial structure */
+        ifnum = sierra_calc_interface(serial);
 
-                        /* We know the alternate setting is 1 for the MC8785 */
-                        usb_set_interface(udev, ifnum, 1);
-                }
+        /*
+         * If this interface supports more than 1 alternate
+         * select the 2nd one
+         */
+        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);
+        }
 
-        /* Check if in installer mode */
-        if (truinstall && id->driver_info == DEVICE_INSTALLER) {
-                dev_dbg(&udev->dev, "%s", "FOUND TRU-INSTALL DEVICE(SW)\n");
-                result = sierra_set_ms_mode(udev, SWIMS_SET_MODE_Modem);
-                /* Don't bind to the device when in installer mode */
-                kfree(num_ports);
-                return -EIO;
-        } else if (id->driver_info == DEVICE_1_PORT)
-                *num_ports = 1;
-        else if (ifnum == 0x99)
+        /* 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 = 3;
+                *num_ports = (numendpoints-1)/2;
+
         /*
          * save off our num_ports info so that we can use it in the
          * calc_num_ports callback
@@ -187,40 +165,50 @@ static struct usb_device_id id_table [] = {
         { USB_DEVICE(0x1199, 0x0218) }, /* Sierra Wireless MC5720 */
         { USB_DEVICE(0x0f30, 0x1b1d) }, /* Sierra Wireless MC5720 */
         { USB_DEVICE(0x1199, 0x0020) }, /* Sierra Wireless MC5725 */
+        { USB_DEVICE(0x1199, 0x0024) }, /* Sierra Wireless MC5727 */
         { USB_DEVICE(0x1199, 0x0220) }, /* Sierra Wireless MC5725 */
         { USB_DEVICE(0x1199, 0x0019) }, /* Sierra Wireless AirCard 595 */
         { USB_DEVICE(0x1199, 0x0021) }, /* Sierra Wireless AirCard 597E */
         { USB_DEVICE(0x1199, 0x0120) }, /* Sierra Wireless USB Dongle 595U */
-        { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x0023, 0xFF, 0xFF, 0xFF) }, /* Sierra Wireless C597 */
+         /* Sierra Wireless C597 */
+        { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x0023, 0xFF, 0xFF, 0xFF) },
+         /* Sierra Wireless Device */
+        { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x0025, 0xFF, 0xFF, 0xFF) },
+        { USB_DEVICE(0x1199, 0x0026) }, /* Sierra Wireless Device */
 
         { USB_DEVICE(0x1199, 0x6802) }, /* Sierra Wireless MC8755 */
         { USB_DEVICE(0x1199, 0x6804) }, /* Sierra Wireless MC8755 */
         { USB_DEVICE(0x1199, 0x6803) }, /* Sierra Wireless MC8765 */
         { USB_DEVICE(0x1199, 0x6812) }, /* Sierra Wireless MC8775 & AC 875U */
-        { USB_DEVICE(0x1199, 0x6813) }, /* Sierra Wireless MC8775 (Thinkpad internal) */
+        { USB_DEVICE(0x1199, 0x6813) }, /* Sierra Wireless MC8775 (Lenovo) */
         { USB_DEVICE(0x1199, 0x6815) }, /* Sierra Wireless MC8775 */
         { USB_DEVICE(0x03f0, 0x1e1d) }, /* HP hs2300 a.k.a MC8775 */
         { USB_DEVICE(0x1199, 0x6820) }, /* Sierra Wireless AirCard 875 */
         { USB_DEVICE(0x1199, 0x6821) }, /* Sierra Wireless AirCard 875U */
-        { USB_DEVICE(0x1199, 0x6832) }, /* Sierra Wireless MC8780*/
-        { USB_DEVICE(0x1199, 0x6833) }, /* Sierra Wireless MC8781*/
-        { USB_DEVICE(0x1199, 0x683B), .driver_info = DEVICE_1_PORT },   /* Sierra Wireless MC8785 Composite*/
+        { USB_DEVICE(0x1199, 0x6832) }, /* Sierra Wireless MC8780 */
+        { USB_DEVICE(0x1199, 0x6833) }, /* Sierra Wireless MC8781 */
+        { 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 */
         { USB_DEVICE(0x1199, 0x6850) }, /* Sierra Wireless AirCard 880 */
         { USB_DEVICE(0x1199, 0x6851) }, /* Sierra Wireless AirCard 881 */
         { USB_DEVICE(0x1199, 0x6852) }, /* Sierra Wireless AirCard 880 E */
         { USB_DEVICE(0x1199, 0x6853) }, /* Sierra Wireless AirCard 881 E */
         { USB_DEVICE(0x1199, 0x6855) }, /* Sierra Wireless AirCard 880 U */
         { USB_DEVICE(0x1199, 0x6856) }, /* Sierra Wireless AirCard 881 U */
-        { USB_DEVICE(0x1199, 0x6859), .driver_info = DEVICE_1_PORT },   /* Sierra Wireless AirCard 885 E */
-        { USB_DEVICE(0x1199, 0x685A), .driver_info = DEVICE_1_PORT },   /* Sierra Wireless AirCard 885 E */
-
-        { USB_DEVICE(0x1199, 0x6468) }, /* Sierra Wireless MP3G - EVDO */
-        { USB_DEVICE(0x1199, 0x6469) }, /* Sierra Wireless MP3G - UMTS/HSPA */
-
-        { USB_DEVICE(0x1199, 0x0112), .driver_info = DEVICE_1_PORT }, /* Sierra Wireless AirCard 580 */
-        { USB_DEVICE(0x0F3D, 0x0112), .driver_info = DEVICE_1_PORT }, /* Airprime/Sierra PC 5220 */
+        { USB_DEVICE(0x1199, 0x6859) }, /* Sierra Wireless AirCard 885 E */
+        { USB_DEVICE(0x1199, 0x685A) }, /* Sierra Wireless AirCard 885 E */
+        /* Sierra Wireless C885 */
+        { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6880, 0xFF, 0xFF, 0xFF)},
+        /* Sierra Wireless Device */
+        { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6890, 0xFF, 0xFF, 0xFF)},
+        /* Sierra Wireless Device */
+        { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6892, 0xFF, 0xFF, 0xFF)},
+
+        { USB_DEVICE(0x1199, 0x0112) }, /* Sierra Wireless AirCard 580 */
+        { USB_DEVICE(0x0F3D, 0x0112) }, /* Airprime/Sierra PC 5220 */
 
-        { USB_DEVICE(0x1199, 0x0FFF), .driver_info = DEVICE_INSTALLER},
         { }
 };
 MODULE_DEVICE_TABLE(usb, id_table);
@@ -268,13 +256,19 @@ static int sierra_send_setup(struct tty_struct *tty,
                 if (portdata->rts_state)
                         val |= 0x02;
 
-                /* Determine which port is targeted */
-                if (port->bulk_out_endpointAddress == 2)
-                        interface = 0;
-                else if (port->bulk_out_endpointAddress == 4)
-                        interface = 1;
-                else if (port->bulk_out_endpointAddress == 5)
-                        interface = 2;
+                /* If composite device then properly report interface */
+                if (serial->num_ports == 1)
+                        interface = sierra_calc_interface(serial);
+
+                /* Otherwise the need to do non-composite mapping */
+                else {
+                        if (port->bulk_out_endpointAddress == 2)
+                                interface = 0;
+                        else if (port->bulk_out_endpointAddress == 4)
+                                interface = 1;
+                        else if (port->bulk_out_endpointAddress == 5)
+                                interface = 2;
+                }
 
                 return usb_control_msg(serial->dev,
                                 usb_rcvctrlpipe(serial->dev, 0),
@@ -713,7 +707,7 @@ static void sierra_shutdown(struct usb_serial *serial)
 static struct usb_serial_driver sierra_device = {
         .driver = {
                 .owner =        THIS_MODULE,
-                .name =         "sierra1",
+                .name =         "sierra",
         },
         .description       = "Sierra USB modem",
         .id_table          = id_table,
@@ -769,14 +763,8 @@ MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_VERSION(DRIVER_VERSION);
 MODULE_LICENSE("GPL");
 
-module_param(truinstall, bool, 0);
-MODULE_PARM_DESC(truinstall, "TRU-Install support");
-
-module_param(nmea, bool, 0);
+module_param(nmea, bool, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(nmea, "NMEA streaming");
 
-#ifdef CONFIG_USB_DEBUG
 module_param(debug, bool, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(debug, "Debug messages");
-#endif
-