This is a note to let you know that I've just added the patch titled
USB: EHCI: fix timer bug affecting port resume
to the 3.4-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:
usb-ehci-fix-timer-bug-affecting-port-resume.patch
and it can be found in the queue-3.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From ee74290b7853db9d5fd64db70e5c175241c59fba Mon Sep 17 00:00:00 2001
From: Alan Stern <[email protected]>
Date: Fri, 25 Jan 2013 17:17:43 -0500
Subject: USB: EHCI: fix timer bug affecting port resume
From: Alan Stern <[email protected]>
commit ee74290b7853db9d5fd64db70e5c175241c59fba upstream.
This patch (as1652) fixes a long-standing bug in ehci-hcd. The driver
relies on status polls to know when to stop port-resume signalling.
It uses the root-hub status timer to schedule these status polls. But
when the driver for the root hub is resumed, the timer is rescheduled
to go off immediately -- before the port is ready. When this happens
the timer does not get re-enabled, which prevents the port resume from
finishing until some other event occurs.
The symptom is that when a new device is plugged in, it doesn't get
recognized or enumerated until lsusb is run or something else happens.
The solution is to re-enable the root-hub status timer after every
status poll while a port resume is in progress.
This bug hasn't surfaced before now because we never used to try to
suspend the root hub in the middle of a port resume (except by
coincidence).
Signed-off-by: Alan Stern <[email protected]>
Reported-and-tested-by: Norbert Preining <[email protected]>
Tested-by: Ming Lei <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/usb/host/ehci-hub.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -612,7 +612,11 @@ ehci_hub_status_data (struct usb_hcd *hc
status = STS_PCD;
}
}
- /* FIXME autosuspend idle root hubs */
+
+ /* If a resume is in progress, make sure it can finish */
+ if (ehci->resuming_ports)
+ mod_timer(&hcd->rh_timer, jiffies + msecs_to_jiffies(25));
+
spin_unlock_irqrestore (&ehci->lock, flags);
return status ? retval : 0;
}
Patches currently in stable-queue which might be from [email protected]
are
queue-3.4/usb-ehci-fix-timer-bug-affecting-port-resume.patch
queue-3.4/usb-ehci-fix-bug-in-scheduling-periodic-split-transfers.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
