Skip to contentSkip to conversation

usb: another ehci_iaa_watchdog fix

PATCH Applied David Brownell 2 participants 2 messages Apr 2, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usb: another ehci_iaa_watchdog fix

This patch, suggested by Alan Stern, fixes the hung USB issues on my notebook from suspend/resume cycles.

It does so by eliminating some confusion about the internal state machine associated with unlinking from the EHCI async schedule ring, which caused a recent regression:

http://bugzilla.kernel.org/show_bug.cgi?id=10345

---
Merge before 2.6.25-final please...

drivers/usb/host/ehci-hub.c +3 -2
@@ -135,8 +135,6 @@
 		hcd->state = HC_STATE_QUIESCING;
 	}
 	ehci->command = ehci_readl(ehci, &ehci->regs->command);
-	if (ehci->reclaim)
-		end_unlink_async(ehci);
 	ehci_work(ehci);
 
 	/* Unlike other USB host controller types, EHCI doesn't have
@@ -180,6 +178,9 @@
 	ehci_halt (ehci);
 	hcd->state = HC_STATE_SUSPENDED;
 
+	if (ehci->reclaim)
+		end_unlink_async(ehci);
+
 	/* allow remote wakeup */
 	mask = INTR_MASK;
 	if (!device_may_wakeup(&hcd->self.root_hub->dev))
#1 lore raw

patch usb-another-ehci_iaa_watchdog-fix.patch added to gregkh-2.6 tree

This is a note to let you know that I've just added the patch titled

Subject: USB: another ehci_iaa_watchdog fix

to my gregkh-2.6 tree. Its filename is

usb-another-ehci_iaa_watchdog-fix.patch

This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/

Quoted 1 line

From [email protected] Wed Apr 2 13:49:39 2008

From: David Brownell <[email protected]>
Date: Wed, 2 Apr 2008 13:40:20 -0700
Subject: USB: another ehci_iaa_watchdog fix
To: Greg KH <[email protected]>
Cc: Andrew Morton <[email protected]>, [email protected], lkml <[email protected]>, Mark Lord <[email protected]>
Message-ID: <[email protected]>
Content-Disposition: inline

This patch, suggested by Alan Stern, fixes the hung USB issues on my notebook from suspend/resume cycles.

It does so by eliminating some confusion about the internal state machine associated with unlinking from the EHCI async schedule ring, which caused a recent regression:

http://bugzilla.kernel.org/show_bug.cgi?id=10345

---
 drivers/usb/host/ehci-hub.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/usb/host/ehci-hub.c +3 -2
@@ -126,8 +126,6 @@ static int ehci_bus_suspend (struct usb_
 		hcd->state = HC_STATE_QUIESCING;
 	}
 	ehci->command = ehci_readl(ehci, &ehci->regs->command);
-	if (ehci->reclaim)
-		end_unlink_async(ehci);
 	ehci_work(ehci);
 
 	/* Unlike other USB host controller types, EHCI doesn't have
@@ -171,6 +169,9 @@ static int ehci_bus_suspend (struct usb_
 	ehci_halt (ehci);
 	hcd->state = HC_STATE_SUSPENDED;
 
+	if (ehci->reclaim)
+		end_unlink_async(ehci);
+
 	/* allow remote wakeup */
 	mask = INTR_MASK;
 	if (!device_may_wakeup(&hcd->self.root_hub->dev))

Patches currently in gregkh-2.6 which might be from [email protected] are

usb/usb-ehci-minor-cleanups.patch usb/usb-defines-for-usb-link-power-management-ecn.patch usb/usb-ehci-minor-soc-bus-glue-fixes.patch usb/usb-ehci-refactor-if-state-hc_state_halt.patch usb/usb-ehci-tolerates-some-buggy-devices.patch usb/usb-ohci-port-reset-paranoia-timeout.patch usb/usb-ehci-paranoia-reject-large-control-transfers.patch usb/usb-g_printer-bugfixes.patch usb/usb-ehci-remove-obsolete-workaround-for-bogus-irqs.patch usb/usb-minor-ehci-xitd-simplifications.patch usb/usb-remove-dev-power.power_state.patch usb/usb-partial-usb-embedded-host-support.patch usb/usb-fix-bug-in-sg-initialization-in-usbtest.patch usb/usb-another-ehci_iaa_watchdog-fix.patch usb/usb-remove-experimental-tags-from-some-usb-gadget-kconfig-entries.patch usb/usb-gadget-dummy_hcd.c-fix-nested-switch-statements.patch usb/usb-ohci-fix-2-timers-to-fire-at-jiffies-1s.patch driver-core/pm-handle-device-registrations-during-suspend-resume.patch driver-core/driver-core-call-device_pm_add-after-bus_add_device-in-device_add.patch