3.7-stable patches

added patches:
	drivers-xhci-fix-incorrect-bit-test.patch
	usb-prevent-dead-ports-when-xhci-is-not-enabled.patch
	usb-storage-define-a-new-macro-for-usb-storage-match-rules.patch
	usb-storage-optimize-to-match-the-huawei-usb-storage-devices-and-support-new-switch-command.patch
	usb-xhci-fix-memory-leak-of-urb-private-data.patch
	xhci-fix-isoc-td-encoding.patch
	xhci-fix-td-size-for-isochronous-urbs.patch

diff --git a/queue-3.7/drivers-xhci-fix-incorrect-bit-test.patch b/queue-3.7/drivers-xhci-fix-incorrect-bit-test.patch
new file mode 100644 (file)
index 0000000..d939516
--- /dev/null
+++ b/queue-3.7/drivers-xhci-fix-incorrect-bit-test.patch
@@ -0,0 +1,36 @@
+From ba7b5c22d33136a5612ca5ef8d31564dcc501126 Mon Sep 17 00:00:00 2001
+From: Nickolai Zeldovich <nickolai@csail.mit.edu>
+Date: Mon, 7 Jan 2013 22:39:31 -0500
+Subject: drivers: xhci: fix incorrect bit test
+
+From: Nickolai Zeldovich <nickolai@csail.mit.edu>
+
+commit ba7b5c22d33136a5612ca5ef8d31564dcc501126 upstream.
+
+Fix incorrect bit test that originally showed up in
+4ee823b83bc9851743fab756c76b27d6a1e2472b "USB/xHCI: Support
+device-initiated USB 3.0 resume."
+
+Use '&' instead of '&&'.
+
+This should be backported to kernels as old as 3.4.
+
+Signed-off-by: Nickolai Zeldovich <nickolai@csail.mit.edu>
+Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/host/xhci-ring.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/usb/host/xhci-ring.c
++++ b/drivers/usb/host/xhci-ring.c
+@@ -1698,7 +1698,7 @@ static void handle_port_status(struct xh
+                               faked_port_index + 1);
+               if (slot_id && xhci->devs[slot_id])
+                       xhci_ring_device(xhci, slot_id);
+-              if (bus_state->port_remote_wakeup && (1 << faked_port_index)) {
++              if (bus_state->port_remote_wakeup & (1 << faked_port_index)) {
+                       bus_state->port_remote_wakeup &=
+                               ~(1 << faked_port_index);
+                       xhci_test_and_clear_bit(xhci, port_array,

diff --git a/queue-3.7/series b/queue-3.7/series
index a9844bf832341a34b60c545eebc5041ec58c0b0f..2b27a29c34d0e529f2818b99a5a91734f92c0f39 100644 (file)
--- a/queue-3.7/series
+++ b/queue-3.7/series
@@ -25,3 +25,10 @@ usb-ehci-unlink-one-async-qh-at-a-time.patch
 usb-ehci-fix-timer-bug-affecting-port-resume.patch
 usb-ehci-fix-bug-in-scheduling-periodic-split-transfers.patch
 usb-using-correct-way-to-clear-usb3.0-device-s-remote-wakeup-feature.patch
+usb-storage-define-a-new-macro-for-usb-storage-match-rules.patch
+usb-storage-optimize-to-match-the-huawei-usb-storage-devices-and-support-new-switch-command.patch
+drivers-xhci-fix-incorrect-bit-test.patch
+xhci-fix-isoc-td-encoding.patch
+xhci-fix-td-size-for-isochronous-urbs.patch
+usb-xhci-fix-memory-leak-of-urb-private-data.patch
+usb-prevent-dead-ports-when-xhci-is-not-enabled.patch

diff --git a/queue-3.7/usb-prevent-dead-ports-when-xhci-is-not-enabled.patch b/queue-3.7/usb-prevent-dead-ports-when-xhci-is-not-enabled.patch
new file mode 100644 (file)
index 0000000..0b3b627
--- /dev/null
+++ b/queue-3.7/usb-prevent-dead-ports-when-xhci-is-not-enabled.patch
@@ -0,0 +1,36 @@
+From 58b2939b4d5a030eaec469d29812ab8477ee7e76 Mon Sep 17 00:00:00 2001
+From: David Moore <david.moore@gmail.com>
+Date: Wed, 23 Jan 2013 22:19:49 -0800
+Subject: usb: Prevent dead ports when xhci is not enabled
+
+From: David Moore <david.moore@gmail.com>
+
+commit 58b2939b4d5a030eaec469d29812ab8477ee7e76 upstream.
+
+When the xHCI driver is not available, actively switch the ports to EHCI
+mode since some BIOSes leave them in xHCI mode where they would
+otherwise appear dead.  This was discovered on a  Dell Optiplex 7010,
+but it's possible other systems could be affected.
+
+This should be backported to kernels as old as 3.0, that contain the
+commit 69e848c2090aebba5698a1620604c7dccb448684 "Intel xhci: Support
+EHCI/xHCI port switching."
+
+Signed-off-by: David Moore <david.moore@gmail.com>
+Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/host/pci-quirks.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/usb/host/pci-quirks.c
++++ b/drivers/usb/host/pci-quirks.c
+@@ -780,6 +780,7 @@ void usb_enable_xhci_ports(struct pci_de
+                               "defaulting to EHCI.\n");
+               dev_warn(&xhci_pdev->dev,
+                               "USB 3.0 devices will work at USB 2.0 speeds.\n");
++              usb_disable_xhci_ports(xhci_pdev);
+               return;
+       }
+ 

diff --git a/queue-3.7/usb-storage-define-a-new-macro-for-usb-storage-match-rules.patch b/queue-3.7/usb-storage-define-a-new-macro-for-usb-storage-match-rules.patch
new file mode 100644 (file)
index 0000000..c196863
--- /dev/null
+++ b/queue-3.7/usb-storage-define-a-new-macro-for-usb-storage-match-rules.patch
@@ -0,0 +1,79 @@
+From 07c7be3d87e5cdaf5f94c271c516456364ef286c Mon Sep 17 00:00:00 2001
+From: fangxiaozhi <huananhu@huawei.com>
+Date: Mon, 4 Feb 2013 15:14:46 +0800
+Subject: USB: storage: Define a new macro for USB storage match rules
+
+From: fangxiaozhi <huananhu@huawei.com>
+
+commit 07c7be3d87e5cdaf5f94c271c516456364ef286c upstream.
+
+1. Define a new macro for USB storage match rules:
+    matching with Vendor ID and interface descriptors.
+
+Signed-off-by: fangxiaozhi <huananhu@huawei.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/storage/usb.c          |   12 ++++++++++++
+ drivers/usb/storage/usual-tables.c |   15 +++++++++++++++
+ 2 files changed, 27 insertions(+)
+
+--- a/drivers/usb/storage/usb.c
++++ b/drivers/usb/storage/usb.c
+@@ -120,6 +120,17 @@ MODULE_PARM_DESC(quirks, "supplemental l
+       .useTransport = use_transport,  \
+ }
+ 
++#define UNUSUAL_VENDOR_INTF(idVendor, cl, sc, pr, \
++              vendor_name, product_name, use_protocol, use_transport, \
++              init_function, Flags) \
++{ \
++      .vendorName = vendor_name,      \
++      .productName = product_name,    \
++      .useProtocol = use_protocol,    \
++      .useTransport = use_transport,  \
++      .initFunction = init_function,  \
++}
++
+ static struct us_unusual_dev us_unusual_dev_list[] = {
+ #     include "unusual_devs.h"
+       { }             /* Terminating entry */
+@@ -131,6 +142,7 @@ static struct us_unusual_dev for_dynamic
+ #undef UNUSUAL_DEV
+ #undef COMPLIANT_DEV
+ #undef USUAL_DEV
++#undef UNUSUAL_VENDOR_INTF
+ 
+ #ifdef CONFIG_LOCKDEP
+ 
+--- a/drivers/usb/storage/usual-tables.c
++++ b/drivers/usb/storage/usual-tables.c
+@@ -41,6 +41,20 @@
+ #define USUAL_DEV(useProto, useTrans) \
+ { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, useProto, useTrans) }
+ 
++/* Define the device is matched with Vendor ID and interface descriptors */
++#define UNUSUAL_VENDOR_INTF(id_vendor, cl, sc, pr, \
++                      vendorName, productName, useProtocol, useTransport, \
++                      initFunction, flags) \
++{ \
++      .match_flags = USB_DEVICE_ID_MATCH_INT_INFO \
++                              | USB_DEVICE_ID_MATCH_VENDOR, \
++      .idVendor    = (id_vendor), \
++      .bInterfaceClass = (cl), \
++      .bInterfaceSubClass = (sc), \
++      .bInterfaceProtocol = (pr), \
++      .driver_info = (flags) \
++}
++
+ struct usb_device_id usb_storage_usb_ids[] = {
+ #     include "unusual_devs.h"
+       { }             /* Terminating entry */
+@@ -50,6 +64,7 @@ MODULE_DEVICE_TABLE(usb, usb_storage_usb
+ #undef UNUSUAL_DEV
+ #undef COMPLIANT_DEV
+ #undef USUAL_DEV
++#undef UNUSUAL_VENDOR_INTF
+ 
+ /*
+  * The table of devices to ignore

diff --git a/queue-3.7/usb-storage-optimize-to-match-the-huawei-usb-storage-devices-and-support-new-switch-command.patch b/queue-3.7/usb-storage-optimize-to-match-the-huawei-usb-storage-devices-and-support-new-switch-command.patch
new file mode 100644 (file)
index 0000000..2248a79
--- /dev/null
+++ b/queue-3.7/usb-storage-optimize-to-match-the-huawei-usb-storage-devices-and-support-new-switch-command.patch
@@ -0,0 +1,462 @@
+From 200e0d994d9d1919b28c87f1a5fb99a8e13b8a0f Mon Sep 17 00:00:00 2001
+From: fangxiaozhi <huananhu@huawei.com>
+Date: Mon, 4 Feb 2013 15:16:34 +0800
+Subject: USB: storage: optimize to match the Huawei USB storage devices and support new switch command
+
+From: fangxiaozhi <huananhu@huawei.com>
+
+commit 200e0d994d9d1919b28c87f1a5fb99a8e13b8a0f upstream.
+
+1. Optimize the match rules with new macro for Huawei USB storage devices,
+   to avoid to load USB storage driver for the modem interface
+   with Huawei devices.
+2. Add to support new switch command for new Huawei USB dongles.
+
+Signed-off-by: fangxiaozhi <huananhu@huawei.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/storage/initializers.c |   76 ++++++++
+ drivers/usb/storage/initializers.h |    4 
+ drivers/usb/storage/unusual_devs.h |  329 -------------------------------------
+ 3 files changed, 78 insertions(+), 331 deletions(-)
+
+--- a/drivers/usb/storage/initializers.c
++++ b/drivers/usb/storage/initializers.c
+@@ -92,8 +92,8 @@ int usb_stor_ucr61s2b_init(struct us_dat
+       return 0;
+ }
+ 
+-/* This places the HUAWEI E220 devices in multi-port mode */
+-int usb_stor_huawei_e220_init(struct us_data *us)
++/* This places the HUAWEI usb dongles in multi-port mode */
++static int usb_stor_huawei_feature_init(struct us_data *us)
+ {
+       int result;
+ 
+@@ -104,3 +104,75 @@ int usb_stor_huawei_e220_init(struct us_
+       US_DEBUGP("Huawei mode set result is %d\n", result);
+       return 0;
+ }
++
++/*
++ * It will send a scsi switch command called rewind' to huawei dongle.
++ * When the dongle receives this command at the first time,
++ * it will reboot immediately. After rebooted, it will ignore this command.
++ * So it is  unnecessary to read its response.
++ */
++static int usb_stor_huawei_scsi_init(struct us_data *us)
++{
++      int result = 0;
++      int act_len = 0;
++      struct bulk_cb_wrap *bcbw = (struct bulk_cb_wrap *) us->iobuf;
++      char rewind_cmd[] = {0x11, 0x06, 0x20, 0x00, 0x00, 0x01, 0x01, 0x00,
++                      0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
++
++      bcbw->Signature = cpu_to_le32(US_BULK_CB_SIGN);
++      bcbw->Tag = 0;
++      bcbw->DataTransferLength = 0;
++      bcbw->Flags = bcbw->Lun = 0;
++      bcbw->Length = sizeof(rewind_cmd);
++      memset(bcbw->CDB, 0, sizeof(bcbw->CDB));
++      memcpy(bcbw->CDB, rewind_cmd, sizeof(rewind_cmd));
++
++      result = usb_stor_bulk_transfer_buf(us, us->send_bulk_pipe, bcbw,
++                                      US_BULK_CB_WRAP_LEN, &act_len);
++      US_DEBUGP("transfer actual length=%d, result=%d\n", act_len, result);
++      return result;
++}
++
++/*
++ * It tries to find the supported Huawei USB dongles.
++ * In Huawei, they assign the following product IDs
++ * for all of their mobile broadband dongles,
++ * including the new dongles in the future.
++ * So if the product ID is not included in this list,
++ * it means it is not Huawei's mobile broadband dongles.
++ */
++static int usb_stor_huawei_dongles_pid(struct us_data *us)
++{
++      struct usb_interface_descriptor *idesc;
++      int idProduct;
++
++      idesc = &us->pusb_intf->cur_altsetting->desc;
++      idProduct = us->pusb_dev->descriptor.idProduct;
++      /* The first port is CDROM,
++       * means the dongle in the single port mode,
++       * and a switch command is required to be sent. */
++      if (idesc && idesc->bInterfaceNumber == 0) {
++              if ((idProduct == 0x1001)
++                      || (idProduct == 0x1003)
++                      || (idProduct == 0x1004)
++                      || (idProduct >= 0x1401 && idProduct <= 0x1500)
++                      || (idProduct >= 0x1505 && idProduct <= 0x1600)
++                      || (idProduct >= 0x1c02 && idProduct <= 0x2202)) {
++                      return 1;
++              }
++      }
++      return 0;
++}
++
++int usb_stor_huawei_init(struct us_data *us)
++{
++      int result = 0;
++
++      if (usb_stor_huawei_dongles_pid(us)) {
++              if (us->pusb_dev->descriptor.idProduct >= 0x1446)
++                      result = usb_stor_huawei_scsi_init(us);
++              else
++                      result = usb_stor_huawei_feature_init(us);
++      }
++      return result;
++}
+--- a/drivers/usb/storage/initializers.h
++++ b/drivers/usb/storage/initializers.h
+@@ -46,5 +46,5 @@ int usb_stor_euscsi_init(struct us_data
+  * flash reader */
+ int usb_stor_ucr61s2b_init(struct us_data *us);
+ 
+-/* This places the HUAWEI E220 devices in multi-port mode */
+-int usb_stor_huawei_e220_init(struct us_data *us);
++/* This places the HUAWEI usb dongles in multi-port mode */
++int usb_stor_huawei_init(struct us_data *us);
+--- a/drivers/usb/storage/unusual_devs.h
++++ b/drivers/usb/storage/unusual_devs.h
+@@ -1527,335 +1527,10 @@ UNUSUAL_DEV(  0x1210, 0x0003, 0x0100, 0x
+ /* Reported by fangxiaozhi <huananhu@huawei.com>
+  * This brings the HUAWEI data card devices into multi-port mode
+  */
+-UNUSUAL_DEV(  0x12d1, 0x1001, 0x0000, 0x0000,
++UNUSUAL_VENDOR_INTF(0x12d1, 0x08, 0x06, 0x50,
+               "HUAWEI MOBILE",
+               "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1003, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1004, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1401, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1402, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1403, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1404, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1405, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1406, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1407, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1408, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1409, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x140A, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x140B, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x140C, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x140D, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x140E, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x140F, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1410, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1411, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1412, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1413, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1414, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1415, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1416, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1417, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1418, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1419, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x141A, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x141B, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x141C, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x141D, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x141E, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x141F, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1420, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1421, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1422, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1423, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1424, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1425, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1426, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1427, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1428, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1429, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x142A, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x142B, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x142C, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x142D, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x142E, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x142F, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1430, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1431, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1432, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1433, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1434, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1435, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1436, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1437, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1438, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x1439, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x143A, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x143B, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x143C, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x143D, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x143E, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-              0),
+-UNUSUAL_DEV(  0x12d1, 0x143F, 0x0000, 0x0000,
+-              "HUAWEI MOBILE",
+-              "Mass Storage",
+-              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
++              USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_init,
+               0),
+ 
+ /* Reported by Vilius Bilinkevicius <vilisas AT xxx DOT lt) */

diff --git a/queue-3.7/usb-xhci-fix-memory-leak-of-urb-private-data.patch b/queue-3.7/usb-xhci-fix-memory-leak-of-urb-private-data.patch
new file mode 100644 (file)
index 0000000..77ea563
--- /dev/null
+++ b/queue-3.7/usb-xhci-fix-memory-leak-of-urb-private-data.patch
@@ -0,0 +1,38 @@
+From 48c3375c5f69b1c2ef3d1051a0009cb9bce0ce24 Mon Sep 17 00:00:00 2001
+From: Alan Stern <stern@rowland.harvard.edu>
+Date: Thu, 17 Jan 2013 10:32:16 -0500
+Subject: USB: XHCI: fix memory leak of URB-private data
+
+From: Alan Stern <stern@rowland.harvard.edu>
+
+commit 48c3375c5f69b1c2ef3d1051a0009cb9bce0ce24 upstream.
+
+This patch (as1640) fixes a memory leak in xhci-hcd.  The urb_priv
+data structure isn't always deallocated in the handle_tx_event()
+routine for non-control transfers.  The patch adds a kfree() call so
+that all paths end up freeing the memory properly.
+
+This patch should be backported to kernels as old as 2.6.36, that
+contain the commit 8e51adccd4c4b9ffcd509d7f2afce0a906139f75 "USB: xHCI:
+Introduce urb_priv structure"
+
+Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
+Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
+Reported-and-tested-by: Martin Mokrejs <mmokrejs@fold.natur.cuni.cz>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/host/xhci-ring.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/usb/host/xhci-ring.c
++++ b/drivers/usb/host/xhci-ring.c
+@@ -2589,6 +2589,8 @@ cleanup:
+                               (trb_comp_code != COMP_STALL &&
+                                       trb_comp_code != COMP_BABBLE))
+                               xhci_urb_free_priv(xhci, urb_priv);
++                      else
++                              kfree(urb_priv);
+ 
+                       usb_hcd_unlink_urb_from_ep(bus_to_hcd(urb->dev->bus), urb);
+                       if ((urb->actual_length != urb->transfer_buffer_length &&

diff --git a/queue-3.7/xhci-fix-isoc-td-encoding.patch b/queue-3.7/xhci-fix-isoc-td-encoding.patch
new file mode 100644 (file)
index 0000000..540556b
--- /dev/null
+++ b/queue-3.7/xhci-fix-isoc-td-encoding.patch
@@ -0,0 +1,40 @@
+From 760973d2a74b93eb1697981f7448f0e62767cfc4 Mon Sep 17 00:00:00 2001
+From: Sarah Sharp <sarah.a.sharp@linux.intel.com>
+Date: Fri, 11 Jan 2013 11:19:07 -0800
+Subject: xhci: Fix isoc TD encoding.
+
+From: Sarah Sharp <sarah.a.sharp@linux.intel.com>
+
+commit 760973d2a74b93eb1697981f7448f0e62767cfc4 upstream.
+
+An isochronous TD is comprised of one isochronous TRB chained to zero or
+more normal TRBs.  Only the isoc TRB has the TBC and TLBPC fields.  The
+normal TRBs must set those fields to zeroes.  The code was setting the
+TBC and TLBPC fields for both isoc and normal TRBs.  Fix this.
+
+This should be backported to stable kernels as old as 3.0, that contain
+the commit b61d378f2da41c748aba6ca19d77e1e1c02bcea5 " xhci 1.0: Set
+transfer burst last packet count field."
+
+Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/host/xhci-ring.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/drivers/usb/host/xhci-ring.c
++++ b/drivers/usb/host/xhci-ring.c
+@@ -3664,9 +3664,11 @@ static int xhci_queue_isoc_tx(struct xhc
+               td = urb_priv->td[i];
+               for (j = 0; j < trbs_per_td; j++) {
+                       u32 remainder = 0;
+-                      field = TRB_TBC(burst_count) | TRB_TLBPC(residue);
++                      field = 0;
+ 
+                       if (first_trb) {
++                              field = TRB_TBC(burst_count) |
++                                      TRB_TLBPC(residue);
+                               /* Queue the isoc TRB */
+                               field |= TRB_TYPE(TRB_ISOC);
+                               /* Assume URB_ISO_ASAP is set */

diff --git a/queue-3.7/xhci-fix-td-size-for-isochronous-urbs.patch b/queue-3.7/xhci-fix-td-size-for-isochronous-urbs.patch
new file mode 100644 (file)
index 0000000..3c5f3ef
--- /dev/null
+++ b/queue-3.7/xhci-fix-td-size-for-isochronous-urbs.patch
@@ -0,0 +1,86 @@
+From f18f8ed2a9adc41c2d9294b85b6af115829d2af1 Mon Sep 17 00:00:00 2001
+From: Sarah Sharp <sarah.a.sharp@linux.intel.com>
+Date: Fri, 11 Jan 2013 13:36:35 -0800
+Subject: xhci: Fix TD size for isochronous URBs.
+
+From: Sarah Sharp <sarah.a.sharp@linux.intel.com>
+
+commit f18f8ed2a9adc41c2d9294b85b6af115829d2af1 upstream.
+
+To calculate the TD size for a particular TRB in an isoc TD, we need
+know the endpoint's max packet size.  Isochronous endpoints also encode
+the number of additional service opportunities in their wMaxPacketSize
+field.  The TD size calculation did not mask off those bits before using
+the field.  This resulted in incorrect TD size information for
+isochronous TRBs when an URB frame buffer crossed a 64KB boundary.
+
+For example:
+ - an isoc endpoint has 2 additional service opportunites and
+   a max packet size of 1020 bytes
+ - a frame transfer buffer contains 3060 bytes
+ - one frame buffer crosses a 64KB boundary, and must be split into
+   one 1276 byte TRB, and one 1784 byte TRB.
+
+The TD size is is the number of packets that remain to be transferred
+for a TD after processing all the max packet sized packets in the
+current TRB and all previous TRBs.
+
+For this TD, the number of packets to be transferred is (3060 / 1020),
+or 3.  The first TRB contains 1276 bytes, which means it contains one
+full packet, and a 256 byte remainder.  After processing all the max
+packet-sized packets in the first TRB, the host will have 2 packets left
+to transfer.
+
+The old code would calculate the TD size for the first TRB as:
+
+total packet count = DIV_ROUND_UP (TD length / endpoint wMaxPacketSize)
+total packet count - (first TRB length / endpoint wMaxPacketSize)
+
+The math should have been:
+
+total packet count = DIV_ROUND_UP (3060 / 1020) = 3
+3 - (1276 / 1020) = 2
+
+Since the old code didn't mask off the additional service interval bits
+from the wMaxPacketSize field, the math ended up as
+
+total packet count = DIV_ROUND_UP (3060 / 5116) = 1
+1 - (1276 / 5116) = 1
+
+Fix this by masking off the number of additional service opportunities
+in the wMaxPacketSize field.
+
+This patch should be backported to stable kernels as old as 3.0, that
+contain the commit 4da6e6f247a2601ab9f1e63424e4d944ed4124f3 "xhci 1.0:
+Update TD size field format."  It may not apply well to kernels older
+than 3.2 because of commit 29cc88979a8818cd8c5019426e945aed118b400e
+"USB: use usb_endpoint_maxp() instead of le16_to_cpu()".
+
+Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/host/xhci-ring.c |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/drivers/usb/host/xhci-ring.c
++++ b/drivers/usb/host/xhci-ring.c
+@@ -3108,7 +3108,7 @@ static u32 xhci_v1_0_td_remainder(int ru
+        * running_total.
+        */
+       packets_transferred = (running_total + trb_buff_len) /
+-              usb_endpoint_maxp(&urb->ep->desc);
++              GET_MAX_PACKET(usb_endpoint_maxp(&urb->ep->desc));
+ 
+       if ((total_packet_count - packets_transferred) > 31)
+               return 31 << 17;
+@@ -3642,7 +3642,8 @@ static int xhci_queue_isoc_tx(struct xhc
+               td_len = urb->iso_frame_desc[i].length;
+               td_remain_len = td_len;
+               total_packet_count = DIV_ROUND_UP(td_len,
+-                              usb_endpoint_maxp(&urb->ep->desc));
++                              GET_MAX_PACKET(
++                                      usb_endpoint_maxp(&urb->ep->desc)));
+               /* A zero-length transfer still involves at least one packet. */
+               if (total_packet_count == 0)
+                       total_packet_count++;