This is a note to let you know that I've just added the patch titled
xhci: Fix oops caused by more USB2 ports than USB3 ports.
to the 3.0-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:
xhci-fix-oops-caused-by-more-usb2-ports-than-usb3-ports.patch
and it can be found in the queue-3.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 3278a55a1aebe2bbd47fbb5196209e5326a88b56 Mon Sep 17 00:00:00 2001
From: Sarah Sharp <[email protected]>
Date: Thu, 9 Feb 2012 14:43:44 -0800
Subject: xhci: Fix oops caused by more USB2 ports than USB3 ports.
From: Sarah Sharp <[email protected]>
commit 3278a55a1aebe2bbd47fbb5196209e5326a88b56 upstream.
The code to set the device removable bits in the USB 2.0 roothub
descriptor was accidentally looking at the USB 3.0 port registers
instead of the USB 2.0 registers. This can cause an oops if there are
more USB 2.0 registers than USB 3.0 registers.
This should be backported to kernels as old as 2.6.39, that contain the
commit 4bbb0ace9a3de8392527e3c87926309d541d3b00 "xhci: Return a USB 3.0
hub descriptor for USB3 roothub."
Signed-off-by: Sarah Sharp <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/usb/host/xhci-hub.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -75,7 +75,7 @@ static void xhci_usb2_hub_descriptor(str
*/
memset(port_removable, 0, sizeof(port_removable));
for (i = 0; i < ports; i++) {
- portsc = xhci_readl(xhci, xhci->usb3_ports[i]);
+ portsc = xhci_readl(xhci, xhci->usb2_ports[i]);
/* If a device is removable, PORTSC reports a 0, same as in the
* hub descriptor DeviceRemovable bits.
*/
Patches currently in stable-queue which might be from
[email protected] are
queue-3.0/usb-set-hub-depth-after-usb3-hub-reset.patch
queue-3.0/usb-fix-handoff-when-bios-disables-host-pci-device.patch
queue-3.0/xhci-fix-encoding-for-hs-bulk-control-nak-rate.patch
queue-3.0/xhci-fix-oops-caused-by-more-usb2-ports-than-usb3-ports.patch
queue-3.0/usb-remove-duplicate-usb-3.0-hub-feature-defines.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
