Commit 3bb1af52 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

USB: EHCI: carry out port handover during each root-hub resume 



This patch (as1044) causes EHCI port handover for non-high-speed
devices to occur during every root-hub resume, not just in cases where
the controller lost power or was reset.  This is necessary because:

	When some machines go into suspend, they remove power from
	on-board USB devices while retaining suspend current for USB
	controllers.

	The user might well unplug a USB device while the system is
	suspended and then plug it back in before resuming.

A corresponding change is made to the core resume routine; now
high-speed root hubs will always be resumed when the system wakes up,
even if they were suspended before the system went to sleep.  If this
weren't done then EHCI port handover wouldn't work, since it is called
when the EHCI root hub is resumed.

Finally, a comment is added to the hub driver explaining the khubd has
to be freezable; if it weren't frozen then it could interfere with
port handover.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8f7f85e9

drivers/usb/core/driver.c

+7 −2
Original line number Diff line number Diff line
@@ -1523,8 +1523,13 @@ static int usb_suspend(struct device *dev, pm_message_t message) 
	udev = to_usb_device(dev);



	/* If udev is already suspended, we can skip this suspend and

	 * we should also skip the upcoming system resume. */

	 * we should also skip the upcoming system resume.  High-speed

	 * root hubs are an exception; they need to resume whenever the

	 * system wakes up in order for USB-PERSIST port handover to work

	 * properly.

	 */

	if (udev->state == USB_STATE_SUSPENDED) {

		if (udev->parent || udev->speed != USB_SPEED_HIGH)

			udev->skip_sys_resume = 1;

		return 0;

	}

drivers/usb/core/hub.c

+6 −0
Original line number Diff line number Diff line
@@ -2890,7 +2890,13 @@ loop: 


static int hub_thread(void *__unused)

{

	/* khubd needs to be freezable to avoid intefering with USB-PERSIST

	 * port handover.  Otherwise it might see that a full-speed device

	 * was gone before the EHCI controller had handed its port over to

	 * the companion full-speed controller.

	 */

	set_freezable();



	do {

		hub_events();

		wait_event_freezable(khubd_wait,

drivers/usb/host/ehci-hub.c

+1 −3
Original line number Diff line number Diff line
@@ -281,8 +281,6 @@ static int ehci_bus_resume (struct usb_hcd *hcd) 
	ehci_writel(ehci, INTR_MASK, &ehci->regs->intr_enable);



	spin_unlock_irq (&ehci->lock);



	if (!power_okay)

	ehci_handover_companion_ports(ehci);

	return 0;

}

drivers/usb/host/ehci-pci.c

+0 −1
Original line number Diff line number Diff line
@@ -329,7 +329,6 @@ static int ehci_pci_resume(struct usb_hcd *hcd) 


	/* here we "know" root ports should always stay powered */

	ehci_port_power(ehci, 1);

	ehci_handover_companion_ports(ehci);



	hcd->state = HC_STATE_SUSPENDED;

	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE