From 48bb485e99b4f944776f514d972be5e674feae58 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 25 May 2012 04:20:06 +0900 Subject: [PATCH] 3.0-stable patches added patches: add-missing-call-to-uart_update_timeout.patch drivers-rtc-rtc-pl031.c-configure-correct-wday-for-2000-01-01.patch md-using-gfp_noio-to-allocate-bio-for-flush-request.patch mm-mempolicy-let-vma_merge-and-vma_split-handle.patch scsi-hpsa-fix-problem-with-msa2xxx-devices.patch tty-allow-uart_register-unregister-register.patch usb-cdc-wdm-poll-must-return-pollhup-if-device-is-gone.patch usb-cdc-wdm-sanitize-error-returns.patch usb-ffs-test-fix-length-argument-of-out-function-call.patch usb-ftdi-sio-add-support-for-physik-instrumente-e-861.patch usb-storage-unusual_devs-entry-for-yarvik-pmp400-mp4-player.patch usb-usbtest-two-super-speed-fixes-for-usbtest.patch workqueue-skip-nr_running-sanity-check-in-worker_enter_idle-if-trustee-is-active.patch --- ...-missing-call-to-uart_update_timeout.patch | 33 +++++ ...onfigure-correct-wday-for-2000-01-01.patch | 60 ++++++++ ...io-to-allocate-bio-for-flush-request.patch | 35 +++++ ...y-let-vma_merge-and-vma_split-handle.patch | 131 ++++++++++++++++++ ...psa-fix-problem-with-msa2xxx-devices.patch | 76 ++++++++++ queue-3.0/series | 13 ++ ...ow-uart_register-unregister-register.patch | 30 ++++ ...ust-return-pollhup-if-device-is-gone.patch | 34 +++++ .../usb-cdc-wdm-sanitize-error-returns.patch | 30 ++++ ...length-argument-of-out-function-call.patch | 32 +++++ ...support-for-physik-instrumente-e-861.patch | 52 +++++++ ...s-entry-for-yarvik-pmp400-mp4-player.patch | 37 +++++ ...st-two-super-speed-fixes-for-usbtest.patch | 57 ++++++++ ...rker_enter_idle-if-trustee-is-active.patch | 48 +++++++ 14 files changed, 668 insertions(+) create mode 100644 queue-3.0/add-missing-call-to-uart_update_timeout.patch create mode 100644 queue-3.0/drivers-rtc-rtc-pl031.c-configure-correct-wday-for-2000-01-01.patch create mode 100644 queue-3.0/md-using-gfp_noio-to-allocate-bio-for-flush-request.patch create mode 100644 queue-3.0/mm-mempolicy-let-vma_merge-and-vma_split-handle.patch create mode 100644 queue-3.0/scsi-hpsa-fix-problem-with-msa2xxx-devices.patch create mode 100644 queue-3.0/tty-allow-uart_register-unregister-register.patch create mode 100644 queue-3.0/usb-cdc-wdm-poll-must-return-pollhup-if-device-is-gone.patch create mode 100644 queue-3.0/usb-cdc-wdm-sanitize-error-returns.patch create mode 100644 queue-3.0/usb-ffs-test-fix-length-argument-of-out-function-call.patch create mode 100644 queue-3.0/usb-ftdi-sio-add-support-for-physik-instrumente-e-861.patch create mode 100644 queue-3.0/usb-storage-unusual_devs-entry-for-yarvik-pmp400-mp4-player.patch create mode 100644 queue-3.0/usb-usbtest-two-super-speed-fixes-for-usbtest.patch create mode 100644 queue-3.0/workqueue-skip-nr_running-sanity-check-in-worker_enter_idle-if-trustee-is-active.patch diff --git a/queue-3.0/add-missing-call-to-uart_update_timeout.patch b/queue-3.0/add-missing-call-to-uart_update_timeout.patch new file mode 100644 index 00000000000..7315b88ef5f --- /dev/null +++ b/queue-3.0/add-missing-call-to-uart_update_timeout.patch @@ -0,0 +1,33 @@ +From 8b979f7c6bf13a57e7b6002f1175312a44773960 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lothar=20Wa=C3=9Fmann?= +Date: Thu, 3 May 2012 11:37:12 +0200 +Subject: Add missing call to uart_update_timeout() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Lothar Waßmann + +commit 8b979f7c6bf13a57e7b6002f1175312a44773960 upstream. + +This patch fixes a problem reported here: +http://article.gmane.org/gmane.linux.ports.arm.kernel/155242/match=auart + +Signed-off-by: Lothar Waßmann +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/tty/serial/mxs-auart.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/tty/serial/mxs-auart.c ++++ b/drivers/tty/serial/mxs-auart.c +@@ -368,6 +368,8 @@ static void mxs_auart_settermios(struct + + writel(ctrl, u->membase + AUART_LINECTRL); + writel(ctrl2, u->membase + AUART_CTRL2); ++ ++ uart_update_timeout(u, termios->c_cflag, baud); + } + + static irqreturn_t mxs_auart_irq_handle(int irq, void *context) diff --git a/queue-3.0/drivers-rtc-rtc-pl031.c-configure-correct-wday-for-2000-01-01.patch b/queue-3.0/drivers-rtc-rtc-pl031.c-configure-correct-wday-for-2000-01-01.patch new file mode 100644 index 00000000000..9af4417c6b7 --- /dev/null +++ b/queue-3.0/drivers-rtc-rtc-pl031.c-configure-correct-wday-for-2000-01-01.patch @@ -0,0 +1,60 @@ +From c0a5f4a05af588a0f9951f8d24e2564b09501918 Mon Sep 17 00:00:00 2001 +From: Rajkumar Kasirajan +Date: Thu, 17 May 2012 17:03:24 -0700 +Subject: drivers/rtc/rtc-pl031.c: configure correct wday for 2000-01-01 + +From: Rajkumar Kasirajan + +commit c0a5f4a05af588a0f9951f8d24e2564b09501918 upstream. + +The reset date of the ST Micro version of PL031 is 2000-01-01. The +correct weekday for 2000-01-01 is saturday, but pl031 is initialized to +sunday. This may lead to alarm malfunction, so configure the correct +wday if RTC_DR indicates reset. + +Signed-off-by: Rajkumar Kasirajan +Signed-off-by: Linus Walleij +Cc: Mattias Wallin +Cc: Alessandro Zummo +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/rtc/rtc-pl031.c | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +--- a/drivers/rtc/rtc-pl031.c ++++ b/drivers/rtc/rtc-pl031.c +@@ -312,6 +312,7 @@ static int pl031_probe(struct amba_devic + int ret; + struct pl031_local *ldata; + struct rtc_class_ops *ops = id->data; ++ unsigned long time; + + ret = amba_request_regions(adev, NULL); + if (ret) +@@ -343,6 +344,23 @@ static int pl031_probe(struct amba_devic + writel(readl(ldata->base + RTC_CR) | RTC_CR_CWEN, + ldata->base + RTC_CR); + ++ /* ++ * On ST PL031 variants, the RTC reset value does not provide correct ++ * weekday for 2000-01-01. Correct the erroneous sunday to saturday. ++ */ ++ if (ldata->hw_designer == AMBA_VENDOR_ST) { ++ if (readl(ldata->base + RTC_YDR) == 0x2000) { ++ time = readl(ldata->base + RTC_DR); ++ if ((time & ++ (RTC_MON_MASK | RTC_MDAY_MASK | RTC_WDAY_MASK)) ++ == 0x02120000) { ++ time = time | (0x7 << RTC_WDAY_SHIFT); ++ writel(0x2000, ldata->base + RTC_YLR); ++ writel(time, ldata->base + RTC_LR); ++ } ++ } ++ } ++ + ldata->rtc = rtc_device_register("pl031", &adev->dev, ops, + THIS_MODULE); + if (IS_ERR(ldata->rtc)) { diff --git a/queue-3.0/md-using-gfp_noio-to-allocate-bio-for-flush-request.patch b/queue-3.0/md-using-gfp_noio-to-allocate-bio-for-flush-request.patch new file mode 100644 index 00000000000..b13dc592da3 --- /dev/null +++ b/queue-3.0/md-using-gfp_noio-to-allocate-bio-for-flush-request.patch @@ -0,0 +1,35 @@ +From b5e1b8cee7ad58a15d2fa79bcd7946acb592602d Mon Sep 17 00:00:00 2001 +From: Shaohua Li +Date: Mon, 21 May 2012 09:26:59 +1000 +Subject: md: using GFP_NOIO to allocate bio for flush request + +From: Shaohua Li + +commit b5e1b8cee7ad58a15d2fa79bcd7946acb592602d upstream. + +A flush request is usually issued in transaction commit code path, so +using GFP_KERNEL to allocate memory for flush request bio falls into +the classic deadlock issue. + +This is suitable for any -stable kernel to which it applies as it +avoids a possible deadlock. + +Signed-off-by: Shaohua Li +Signed-off-by: NeilBrown +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/md/md.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/md/md.c ++++ b/drivers/md/md.c +@@ -409,7 +409,7 @@ static void submit_flushes(struct work_s + atomic_inc(&rdev->nr_pending); + atomic_inc(&rdev->nr_pending); + rcu_read_unlock(); +- bi = bio_alloc_mddev(GFP_KERNEL, 0, mddev); ++ bi = bio_alloc_mddev(GFP_NOIO, 0, mddev); + bi->bi_end_io = md_end_flush; + bi->bi_private = rdev; + bi->bi_bdev = rdev->bdev; diff --git a/queue-3.0/mm-mempolicy-let-vma_merge-and-vma_split-handle.patch b/queue-3.0/mm-mempolicy-let-vma_merge-and-vma_split-handle.patch new file mode 100644 index 00000000000..6b6b36aa13d --- /dev/null +++ b/queue-3.0/mm-mempolicy-let-vma_merge-and-vma_split-handle.patch @@ -0,0 +1,131 @@ +From 05f144a0d5c2207a0349348127f996e104ad7404 Mon Sep 17 00:00:00 2001 +From: Mel Gorman +Date: Wed, 23 May 2012 12:48:13 +0100 +Subject: mm: mempolicy: Let vma_merge and vma_split handle + vma->vm_policy linkages + +From: Mel Gorman + +commit 05f144a0d5c2207a0349348127f996e104ad7404 upstream. + +Dave Jones' system call fuzz testing tool "trinity" triggered the +following bug error with slab debugging enabled + + ============================================================================= + BUG numa_policy (Not tainted): Poison overwritten + ----------------------------------------------------------------------------- + + INFO: 0xffff880146498250-0xffff880146498250. First byte 0x6a instead of 0x6b + INFO: Allocated in mpol_new+0xa3/0x140 age=46310 cpu=6 pid=32154 + __slab_alloc+0x3d3/0x445 + kmem_cache_alloc+0x29d/0x2b0 + mpol_new+0xa3/0x140 + sys_mbind+0x142/0x620 + system_call_fastpath+0x16/0x1b + INFO: Freed in __mpol_put+0x27/0x30 age=46268 cpu=6 pid=32154 + __slab_free+0x2e/0x1de + kmem_cache_free+0x25a/0x260 + __mpol_put+0x27/0x30 + remove_vma+0x68/0x90 + exit_mmap+0x118/0x140 + mmput+0x73/0x110 + exit_mm+0x108/0x130 + do_exit+0x162/0xb90 + do_group_exit+0x4f/0xc0 + sys_exit_group+0x17/0x20 + system_call_fastpath+0x16/0x1b + INFO: Slab 0xffffea0005192600 objects=27 used=27 fp=0x (null) flags=0x20000000004080 + INFO: Object 0xffff880146498250 @offset=592 fp=0xffff88014649b9d0 + +This implied a reference counting bug and the problem happened during +mbind(). + +mbind() applies a new memory policy to a range and uses mbind_range() to +merge existing VMAs or split them as necessary. In the event of splits, +mpol_dup() will allocate a new struct mempolicy and maintain existing +reference counts whose rules are documented in +Documentation/vm/numa_memory_policy.txt . + +The problem occurs with shared memory policies. The vm_op->set_policy +increments the reference count if necessary and split_vma() and +vma_merge() have already handled the existing reference counts. +However, policy_vma() screws it up by replacing an existing +vma->vm_policy with one that potentially has the wrong reference count +leading to a premature free. This patch removes the damage caused by +policy_vma(). + +With this patch applied Dave's trinity tool runs an mbind test for 5 +minutes without error. /proc/slabinfo reported that there are no +numa_policy or shared_policy_node objects allocated after the test +completed and the shared memory region was deleted. + +Signed-off-by: Mel Gorman +Cc: Dave Jones +Cc: KOSAKI Motohiro +Cc: Stephen Wilson +Cc: Christoph Lameter +Cc: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + mm/mempolicy.c | 41 +++++++++++++++++------------------------ + 1 file changed, 17 insertions(+), 24 deletions(-) + +--- a/mm/mempolicy.c ++++ b/mm/mempolicy.c +@@ -606,27 +606,6 @@ check_range(struct mm_struct *mm, unsign + return first; + } + +-/* Apply policy to a single VMA */ +-static int policy_vma(struct vm_area_struct *vma, struct mempolicy *new) +-{ +- int err = 0; +- struct mempolicy *old = vma->vm_policy; +- +- pr_debug("vma %lx-%lx/%lx vm_ops %p vm_file %p set_policy %p\n", +- vma->vm_start, vma->vm_end, vma->vm_pgoff, +- vma->vm_ops, vma->vm_file, +- vma->vm_ops ? vma->vm_ops->set_policy : NULL); +- +- if (vma->vm_ops && vma->vm_ops->set_policy) +- err = vma->vm_ops->set_policy(vma, new); +- if (!err) { +- mpol_get(new); +- vma->vm_policy = new; +- mpol_put(old); +- } +- return err; +-} +- + /* Step 2: apply policy to a range and do splits. */ + static int mbind_range(struct mm_struct *mm, unsigned long start, + unsigned long end, struct mempolicy *new_pol) +@@ -666,9 +645,23 @@ static int mbind_range(struct mm_struct + if (err) + goto out; + } +- err = policy_vma(vma, new_pol); +- if (err) +- goto out; ++ ++ /* ++ * Apply policy to a single VMA. The reference counting of ++ * policy for vma_policy linkages has already been handled by ++ * vma_merge and split_vma as necessary. If this is a shared ++ * policy then ->set_policy will increment the reference count ++ * for an sp node. ++ */ ++ pr_debug("vma %lx-%lx/%lx vm_ops %p vm_file %p set_policy %p\n", ++ vma->vm_start, vma->vm_end, vma->vm_pgoff, ++ vma->vm_ops, vma->vm_file, ++ vma->vm_ops ? vma->vm_ops->set_policy : NULL); ++ if (vma->vm_ops && vma->vm_ops->set_policy) { ++ err = vma->vm_ops->set_policy(vma, new_pol); ++ if (err) ++ goto out; ++ } + } + + out: diff --git a/queue-3.0/scsi-hpsa-fix-problem-with-msa2xxx-devices.patch b/queue-3.0/scsi-hpsa-fix-problem-with-msa2xxx-devices.patch new file mode 100644 index 00000000000..f915bda2e67 --- /dev/null +++ b/queue-3.0/scsi-hpsa-fix-problem-with-msa2xxx-devices.patch @@ -0,0 +1,76 @@ +From 9bc3711cbb67ac620bf09b4a147cbab45b2c36c0 Mon Sep 17 00:00:00 2001 +From: "Stephen M. Cameron" +Date: Thu, 19 Jan 2012 14:01:04 -0600 +Subject: SCSI: hpsa: Fix problem with MSA2xxx devices + +From: "Stephen M. Cameron" + +commit 9bc3711cbb67ac620bf09b4a147cbab45b2c36c0 upstream. + +Upgraded firmware on Smart Array P7xx (and some others) made them show up as +SCSI revision 5 devices and this caused the driver to fail to map MSA2xxx +logical drives to the correct bus/target/lun. A symptom of this would be that +the target ID of the logical drives as presented by the external storage array +is ignored, and all such logical drives are assigned to target zero, +differentiated only by LUN. Some multipath software reportedly does not deal +well with this behavior, failing to recognize different paths to the same +device as such. + +Signed-off-by: Stephen M. Cameron +Signed-off-by: Scott Teel +Signed-off-by: James Bottomley +Cc: Jonathan Nieder +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/scsi/hpsa.c | 34 +++++++++++++++------------------- + 1 file changed, 15 insertions(+), 19 deletions(-) + +--- a/drivers/scsi/hpsa.c ++++ b/drivers/scsi/hpsa.c +@@ -1654,30 +1654,26 @@ static void figure_bus_target_lun(struct + + if (is_logical_dev_addr_mode(lunaddrbytes)) { + /* logical device */ +- if (unlikely(is_scsi_rev_5(h))) { +- /* p1210m, logical drives lun assignments +- * match SCSI REPORT LUNS data. ++ lunid = le32_to_cpu(*((__le32 *) lunaddrbytes)); ++ if (is_msa2xxx(h, device)) { ++ /* msa2xxx way, put logicals on bus 1 ++ * and match target/lun numbers box ++ * reports. + */ +- lunid = le32_to_cpu(*((__le32 *) lunaddrbytes)); +- *bus = 0; +- *target = 0; +- *lun = (lunid & 0x3fff) + 1; ++ *bus = 1; ++ *target = (lunid >> 16) & 0x3fff; ++ *lun = lunid & 0x00ff; + } else { +- /* not p1210m... */ +- lunid = le32_to_cpu(*((__le32 *) lunaddrbytes)); +- if (is_msa2xxx(h, device)) { +- /* msa2xxx way, put logicals on bus 1 +- * and match target/lun numbers box +- * reports. +- */ +- *bus = 1; +- *target = (lunid >> 16) & 0x3fff; +- *lun = lunid & 0x00ff; ++ if (likely(is_scsi_rev_5(h))) { ++ /* All current smart arrays (circa 2011) */ ++ *bus = 0; ++ *target = 0; ++ *lun = (lunid & 0x3fff) + 1; + } else { +- /* Traditional smart array way. */ ++ /* Traditional old smart array way. */ + *bus = 0; +- *lun = 0; + *target = lunid & 0x3fff; ++ *lun = 0; + } + } + } else { diff --git a/queue-3.0/series b/queue-3.0/series index abf6a22daf7..3ee6d31015e 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -21,3 +21,16 @@ ahci-detect-marvell-88se9172-sata-controller.patch um-fix-__swp_type.patch um-implement-a-custom-pte_same-function.patch docs-update-howto-for-2.6.x-3.x-versioning.patch +usb-cdc-wdm-sanitize-error-returns.patch +usb-cdc-wdm-poll-must-return-pollhup-if-device-is-gone.patch +workqueue-skip-nr_running-sanity-check-in-worker_enter_idle-if-trustee-is-active.patch +mm-mempolicy-let-vma_merge-and-vma_split-handle.patch +md-using-gfp_noio-to-allocate-bio-for-flush-request.patch +add-missing-call-to-uart_update_timeout.patch +tty-allow-uart_register-unregister-register.patch +usb-ftdi-sio-add-support-for-physik-instrumente-e-861.patch +usb-storage-unusual_devs-entry-for-yarvik-pmp400-mp4-player.patch +usb-ffs-test-fix-length-argument-of-out-function-call.patch +drivers-rtc-rtc-pl031.c-configure-correct-wday-for-2000-01-01.patch +scsi-hpsa-fix-problem-with-msa2xxx-devices.patch +usb-usbtest-two-super-speed-fixes-for-usbtest.patch diff --git a/queue-3.0/tty-allow-uart_register-unregister-register.patch b/queue-3.0/tty-allow-uart_register-unregister-register.patch new file mode 100644 index 00000000000..40bc9d37740 --- /dev/null +++ b/queue-3.0/tty-allow-uart_register-unregister-register.patch @@ -0,0 +1,30 @@ +From 1e66cded334e6cea596c72f6f650eec351b1e959 Mon Sep 17 00:00:00 2001 +From: Alan Cox +Date: Mon, 14 May 2012 14:51:22 +0100 +Subject: tty: Allow uart_register/unregister/register + +From: Alan Cox + +commit 1e66cded334e6cea596c72f6f650eec351b1e959 upstream. + +This is legitimate but because we don't clear the drv->state pointer in the +unregister code causes a bogus BUG(). + +Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=42880 +Signed-off-by: Alan Cox +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/tty/serial/serial_core.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/tty/serial/serial_core.c ++++ b/drivers/tty/serial/serial_core.c +@@ -2325,6 +2325,7 @@ void uart_unregister_driver(struct uart_ + tty_unregister_driver(p); + put_tty_driver(p); + kfree(drv->state); ++ drv->state = NULL; + drv->tty_driver = NULL; + } + diff --git a/queue-3.0/usb-cdc-wdm-poll-must-return-pollhup-if-device-is-gone.patch b/queue-3.0/usb-cdc-wdm-poll-must-return-pollhup-if-device-is-gone.patch new file mode 100644 index 00000000000..a1cec9a23bf --- /dev/null +++ b/queue-3.0/usb-cdc-wdm-poll-must-return-pollhup-if-device-is-gone.patch @@ -0,0 +1,34 @@ +From 616b6937e348ef2b4c6ea5fef2cd3c441145efb0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= +Date: Wed, 9 May 2012 13:53:21 +0200 +Subject: USB: cdc-wdm: poll must return POLLHUP if device is gone +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Bjørn Mork + +commit 616b6937e348ef2b4c6ea5fef2cd3c441145efb0 upstream. + +Else the poll will be restarted indefinitely in a tight loop, +preventing final device cleanup. + +Cc: Oliver Neukum +Signed-off-by: Bjørn Mork +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/class/cdc-wdm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/usb/class/cdc-wdm.c ++++ b/drivers/usb/class/cdc-wdm.c +@@ -511,7 +511,7 @@ static unsigned int wdm_poll(struct file + + spin_lock_irqsave(&desc->iuspin, flags); + if (test_bit(WDM_DISCONNECTING, &desc->flags)) { +- mask = POLLERR; ++ mask = POLLHUP | POLLERR; + spin_unlock_irqrestore(&desc->iuspin, flags); + goto desc_out; + } diff --git a/queue-3.0/usb-cdc-wdm-sanitize-error-returns.patch b/queue-3.0/usb-cdc-wdm-sanitize-error-returns.patch new file mode 100644 index 00000000000..637043d8a40 --- /dev/null +++ b/queue-3.0/usb-cdc-wdm-sanitize-error-returns.patch @@ -0,0 +1,30 @@ +From 24a85bae5da2b43fed423859c09c5a81ab359473 Mon Sep 17 00:00:00 2001 +From: Oliver Neukum +Date: Fri, 27 Apr 2012 14:23:54 +0200 +Subject: USB: cdc-wdm: sanitize error returns + +From: Oliver Neukum + +commit 24a85bae5da2b43fed423859c09c5a81ab359473 upstream. + +wdm_flush() returns unsanitized USB error codes. +They must be cleaned up to before being anded to user space + +Signed-off-by: Oliver Neukum +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/class/cdc-wdm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/usb/class/cdc-wdm.c ++++ b/drivers/usb/class/cdc-wdm.c +@@ -500,7 +500,7 @@ static int wdm_flush(struct file *file, + dev_err(&desc->intf->dev, "Error in flush path: %d\n", + desc->werr); + +- return desc->werr; ++ return usb_translate_errors(desc->werr); + } + + static unsigned int wdm_poll(struct file *file, struct poll_table_struct *wait) diff --git a/queue-3.0/usb-ffs-test-fix-length-argument-of-out-function-call.patch b/queue-3.0/usb-ffs-test-fix-length-argument-of-out-function-call.patch new file mode 100644 index 00000000000..f251fe90a38 --- /dev/null +++ b/queue-3.0/usb-ffs-test-fix-length-argument-of-out-function-call.patch @@ -0,0 +1,32 @@ +From eb9c5836384cd2a276254df6254ed71117983626 Mon Sep 17 00:00:00 2001 +From: Matthias Fend +Date: Mon, 7 May 2012 14:37:30 +0200 +Subject: USB: ffs-test: fix length argument of out function call + +From: Matthias Fend + +commit eb9c5836384cd2a276254df6254ed71117983626 upstream. + +The out functions should only handle actual available data instead of the complete buffer. +Otherwise for example the ep0_consume function will report ghost events since it tries to decode +the complete buffer - which may contain partly invalid data. + +Signed-off-by: Matthias Fend +Acked-by: Michal Nazarewicz +Signed-off-by: Greg Kroah-Hartman + +--- + tools/usb/ffs-test.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/usb/ffs-test.c ++++ b/tools/usb/ffs-test.c +@@ -324,7 +324,7 @@ static void *start_thread_helper(void *a + + ret = t->in(t, t->buf, t->buf_size); + if (ret > 0) { +- ret = t->out(t, t->buf, t->buf_size); ++ ret = t->out(t, t->buf, ret); + name = out_name; + op = "write"; + } else { diff --git a/queue-3.0/usb-ftdi-sio-add-support-for-physik-instrumente-e-861.patch b/queue-3.0/usb-ftdi-sio-add-support-for-physik-instrumente-e-861.patch new file mode 100644 index 00000000000..94c16fd234e --- /dev/null +++ b/queue-3.0/usb-ftdi-sio-add-support-for-physik-instrumente-e-861.patch @@ -0,0 +1,52 @@ +From b69cc672052540e8efb1368420f10d7d4d8b8a3d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=89ric=20Piel?= +Date: Mon, 7 May 2012 12:37:54 +0200 +Subject: USB: ftdi-sio: add support for Physik Instrumente E-861 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Éric Piel + +commit b69cc672052540e8efb1368420f10d7d4d8b8a3d upstream. + +This adds VID/PID for the PI E-861. Without it, I had to do: +modprobe -q ftdi-sio product=0x1008 vendor=0x1a72 + +http://www.physikinstrumente.com/en/products/prdetail.php?sortnr=900610 + +Signed-off-by: Éric Piel +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/ftdi_sio.c | 1 + + drivers/usb/serial/ftdi_sio_ids.h | 8 ++++++++ + 2 files changed, 9 insertions(+) + +--- a/drivers/usb/serial/ftdi_sio.c ++++ b/drivers/usb/serial/ftdi_sio.c +@@ -807,6 +807,7 @@ static struct usb_device_id id_table_com + .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, + { USB_DEVICE(LARSENBRUSGAARD_VID, LB_ALTITRACK_PID) }, + { USB_DEVICE(GN_OTOMETRICS_VID, AURICAL_USB_PID) }, ++ { USB_DEVICE(PI_VID, PI_E861_PID) }, + { USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) }, + { USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID), + .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, +--- a/drivers/usb/serial/ftdi_sio_ids.h ++++ b/drivers/usb/serial/ftdi_sio_ids.h +@@ -785,6 +785,14 @@ + #define RTSYSTEMS_SERIAL_VX7_PID 0x9e52 /* Serial converter for VX-7 Radios using FT232RL */ + #define RTSYSTEMS_CT29B_PID 0x9e54 /* CT29B Radio Cable */ + ++ ++/* ++ * Physik Instrumente ++ * http://www.physikinstrumente.com/en/products/ ++ */ ++#define PI_VID 0x1a72 /* Vendor ID */ ++#define PI_E861_PID 0x1008 /* E-861 piezo controller USB connection */ ++ + /* + * Bayer Ascensia Contour blood glucose meter USB-converter cable. + * http://winglucofacts.com/cables/ diff --git a/queue-3.0/usb-storage-unusual_devs-entry-for-yarvik-pmp400-mp4-player.patch b/queue-3.0/usb-storage-unusual_devs-entry-for-yarvik-pmp400-mp4-player.patch new file mode 100644 index 00000000000..0df45975cf1 --- /dev/null +++ b/queue-3.0/usb-storage-unusual_devs-entry-for-yarvik-pmp400-mp4-player.patch @@ -0,0 +1,37 @@ +From df767b71e5816692134d59c0c17e0f77cd73333d Mon Sep 17 00:00:00 2001 +From: Alan Stern +Date: Tue, 8 May 2012 15:15:25 -0400 +Subject: usb-storage: unusual_devs entry for Yarvik PMP400 MP4 player + +From: Alan Stern + +commit df767b71e5816692134d59c0c17e0f77cd73333d upstream. + +This patch (as1553) adds an unusual_dev entrie for the Yarvik PMP400 +MP4 music player. + +Signed-off-by: Alan Stern +Reported-by: Jesse Feddema +Tested-by: Jesse Feddema +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/storage/unusual_devs.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/usb/storage/unusual_devs.h ++++ b/drivers/usb/storage/unusual_devs.h +@@ -1885,6 +1885,13 @@ UNUSUAL_DEV( 0x1652, 0x6600, 0x0201, 0x + USB_SC_DEVICE, USB_PR_DEVICE, NULL, + US_FL_IGNORE_RESIDUE ), + ++/* Reported by Jesse Feddema */ ++UNUSUAL_DEV( 0x177f, 0x0400, 0x0000, 0x0000, ++ "Yarvik", ++ "PMP400", ++ USB_SC_DEVICE, USB_PR_DEVICE, NULL, ++ US_FL_BULK_IGNORE_TAG | US_FL_MAX_SECTORS_64 ), ++ + /* Reported by Hans de Goede + * These Appotech controllers are found in Picture Frames, they provide a + * (buggy) emulation of a cdrom drive which contains the windows software diff --git a/queue-3.0/usb-usbtest-two-super-speed-fixes-for-usbtest.patch b/queue-3.0/usb-usbtest-two-super-speed-fixes-for-usbtest.patch new file mode 100644 index 00000000000..3f98b8d16a5 --- /dev/null +++ b/queue-3.0/usb-usbtest-two-super-speed-fixes-for-usbtest.patch @@ -0,0 +1,57 @@ +From 6a23ccd216b6a8ba2c67a9f9d8969b4431ad2920 Mon Sep 17 00:00:00 2001 +From: Paul Zimmerman +Date: Mon, 16 Apr 2012 14:19:07 -0700 +Subject: usb: usbtest: two super speed fixes for usbtest + +From: Paul Zimmerman + +commit 6a23ccd216b6a8ba2c67a9f9d8969b4431ad2920 upstream. + +bMaxPacketSize0 field for super speed is a power of 2, not a count. +The size itself is always 512. + +Max packet size for a super speed bulk endpoint is 1024, so +allocate the urb size in halt_simple() accordingly. + +Signed-off-by: Paul Zimmerman +Acked-by: Felipe Balbi +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/misc/usbtest.c | 17 ++++++++++++----- + 1 file changed, 12 insertions(+), 5 deletions(-) + +--- a/drivers/usb/misc/usbtest.c ++++ b/drivers/usb/misc/usbtest.c +@@ -1023,7 +1023,10 @@ test_ctrl_queue(struct usbtest_dev *dev, + case 13: /* short read, resembling case 10 */ + req.wValue = cpu_to_le16((USB_DT_CONFIG << 8) | 0); + /* last data packet "should" be DATA1, not DATA0 */ +- len = 1024 - udev->descriptor.bMaxPacketSize0; ++ if (udev->speed == USB_SPEED_SUPER) ++ len = 1024 - 512; ++ else ++ len = 1024 - udev->descriptor.bMaxPacketSize0; + expected = -EREMOTEIO; + break; + case 14: /* short read; try to fill the last packet */ +@@ -1382,11 +1385,15 @@ static int test_halt(struct usbtest_dev + + static int halt_simple(struct usbtest_dev *dev) + { +- int ep; +- int retval = 0; +- struct urb *urb; ++ int ep; ++ int retval = 0; ++ struct urb *urb; ++ struct usb_device *udev = testdev_to_usbdev(dev); + +- urb = simple_alloc_urb(testdev_to_usbdev(dev), 0, 512); ++ if (udev->speed == USB_SPEED_SUPER) ++ urb = simple_alloc_urb(udev, 0, 1024); ++ else ++ urb = simple_alloc_urb(udev, 0, 512); + if (urb == NULL) + return -ENOMEM; + diff --git a/queue-3.0/workqueue-skip-nr_running-sanity-check-in-worker_enter_idle-if-trustee-is-active.patch b/queue-3.0/workqueue-skip-nr_running-sanity-check-in-worker_enter_idle-if-trustee-is-active.patch new file mode 100644 index 00000000000..c911ae720db --- /dev/null +++ b/queue-3.0/workqueue-skip-nr_running-sanity-check-in-worker_enter_idle-if-trustee-is-active.patch @@ -0,0 +1,48 @@ +From 544ecf310f0e7f51fa057ac2a295fc1b3b35a9d3 Mon Sep 17 00:00:00 2001 +From: Tejun Heo +Date: Mon, 14 May 2012 15:04:50 -0700 +Subject: workqueue: skip nr_running sanity check in worker_enter_idle() if trustee is active + +From: Tejun Heo + +commit 544ecf310f0e7f51fa057ac2a295fc1b3b35a9d3 upstream. + +worker_enter_idle() has WARN_ON_ONCE() which triggers if nr_running +isn't zero when every worker is idle. This can trigger spuriously +while a cpu is going down due to the way trustee sets %WORKER_ROGUE +and zaps nr_running. + +It first sets %WORKER_ROGUE on all workers without updating +nr_running, releases gcwq->lock, schedules, regrabs gcwq->lock and +then zaps nr_running. If the last running worker enters idle +inbetween, it would see stale nr_running which hasn't been zapped yet +and trigger the WARN_ON_ONCE(). + +Fix it by performing the sanity check iff the trustee is idle. + +Signed-off-by: Tejun Heo +Reported-by: "Paul E. McKenney" +Signed-off-by: Greg Kroah-Hartman + +--- + kernel/workqueue.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +--- a/kernel/workqueue.c ++++ b/kernel/workqueue.c +@@ -1214,8 +1214,13 @@ static void worker_enter_idle(struct wor + } else + wake_up_all(&gcwq->trustee_wait); + +- /* sanity check nr_running */ +- WARN_ON_ONCE(gcwq->nr_workers == gcwq->nr_idle && ++ /* ++ * Sanity check nr_running. Because trustee releases gcwq->lock ++ * between setting %WORKER_ROGUE and zapping nr_running, the ++ * warning may trigger spuriously. Check iff trustee is idle. ++ */ ++ WARN_ON_ONCE(gcwq->trustee_state == TRUSTEE_DONE && ++ gcwq->nr_workers == gcwq->nr_idle && + atomic_read(get_gcwq_nr_running(gcwq->cpu))); + } + -- 2.47.3