This is a note to let you know that I've just added the patch titled
xhci: Don't let the USB core disable SuperSpeed ports.
to the 2.6.36-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-don-t-let-the-usb-core-disable-superspeed-ports.patch
and it can be found in the queue-2.6.36 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 6dd0a3a7e0793dbeae1b951f091025d8cf896cb4 Mon Sep 17 00:00:00 2001
From: Sarah Sharp <[email protected]>
Date: Tue, 16 Nov 2010 15:58:52 -0800
Subject: xhci: Don't let the USB core disable SuperSpeed ports.
From: Sarah Sharp <[email protected]>
commit 6dd0a3a7e0793dbeae1b951f091025d8cf896cb4 upstream.
Disabling SuperSpeed ports is a Very Bad Thing (TM). It disables
SuperSpeed terminations, which means that devices will never connect at
SuperSpeed on that port. For USB 2.0/1.1 ports, disabling the port meant
that the USB core could always get a connect status change later. That's
not true with USB 3.0 ports.
Do not let the USB core disable SuperSpeed ports. We can't rely on the
device speed in the port status registers, since that isn't valid until
there's a USB device connected to the port. Instead, we use the port
speed array that's created from the Extended Capabilities registers.
Signed-off-by: Sarah Sharp <[email protected]>
Tested-by: Don Zickus <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/usb/host/xhci-hub.c | 7 +++++++
1 file changed, 7 insertions(+)
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -132,6 +132,13 @@ static u32 xhci_port_state_to_neutral(u3
static void xhci_disable_port(struct xhci_hcd *xhci, u16 wIndex,
u32 __iomem *addr, u32 port_status)
{
+ /* Don't allow the USB core to disable SuperSpeed ports. */
+ if (xhci->port_array[wIndex] == 0x03) {
+ xhci_dbg(xhci, "Ignoring request to disable "
+ "SuperSpeed port.\n");
+ return;
+ }
+
/* Write 1 to disable the port */
xhci_writel(xhci, port_status | PORT_PE, addr);
port_status = xhci_readl(xhci, addr);
Patches currently in stable-queue which might be from
[email protected] are
queue-2.6.36/xhci-setup-array-of-usb-2.0-and-usb-3.0-ports.patch
queue-2.6.36/xhci-remove-excessive-printks-with-shared-irqs.patch
queue-2.6.36/xhci-fix-wmaxpacketsize-mask.patch
queue-2.6.36/xhci-don-t-let-the-usb-core-disable-superspeed-ports.patch
queue-2.6.36/xhci-fix-reset-device-and-configure-endpoint-commands.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
