This is a note to let you know that I've just added the patch titled
Revert "xhci: Avoid infinite loop when sg urb requires too many trbs"
to the 3.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-xhci-avoid-infinite-loop-when-sg-urb-requires-too-many-trbs.patch
and it can be found in the queue-3.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 9cf00d91708221ff2d8a11143315f7ebab8d5da8 Mon Sep 17 00:00:00 2001
From: Sarah Sharp <sarah.a.sharp@xxxxxxxxxxxxxxx>
Date: Fri, 31 Jan 2014 11:51:59 -0800
Subject: Revert "xhci: Avoid infinite loop when sg urb requires too many trbs"
From: Sarah Sharp <sarah.a.sharp@xxxxxxxxxxxxxxx>
commit 9cf00d91708221ff2d8a11143315f7ebab8d5da8 upstream.
This reverts commit d6c9ea9069af684358efedcaf2f2f687f51c58ee.
We are ripping out commit 35773dac5f862cb1c82ea151eba3e2f6de51ec3e "usb:
xhci: Link TRB must not occur within a USB payload burst" because it's a
hack that caused regressions in the usb-storage and userspace USB
drivers that use usbfs and libusb. This commit attempted to fix the
issues with that patch.
Signed-off-by: Sarah Sharp <sarah.a.sharp@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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
@@ -2964,7 +2964,7 @@ static int prepare_ring(struct xhci_hcd
if (num_trbs >= TRBS_PER_SEGMENT) {
xhci_err(xhci, "Too many fragments %d, max %d\n",
num_trbs, TRBS_PER_SEGMENT - 1);
- return -EINVAL;
+ return -ENOMEM;
}
nop_cmd = cpu_to_le32(TRB_TYPE(TRB_TR_NOOP) |
Patches currently in stable-queue which might be from sarah.a.sharp@xxxxxxxxxxxxxxx are
queue-3.12/revert-xhci-avoid-infinite-loop-when-sg-urb-requires-too-many-trbs.patch
queue-3.12/revert-xhci-set-scatter-gather-limit-to-avoid-failed-block-writes.patch
queue-3.12/revert-usb-xhci-link-trb-must-not-occur-within-a-usb-payload-burst.patch
queue-3.12/xhci-1.0-limit-arbitrarily-aligned-scatter-gather.patch
queue-3.12/revert-usbcore-set-lpm_capable-field-for-lpm-capable-root-hubs.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html