From: David Brownell <[EMAIL PROTECTED]>
This teaches several USB host controller drivers to treat PRETHAW as a chip
reset since the controller, and all devices connected to it, are no longer in
states compatible with how the snapshotted suspend() left them.
Signed-off-by: David Brownell <[EMAIL PROTECTED]>
Cc: Greg KH <[EMAIL PROTECTED]>
Cc: "Rafael J. Wysocki" <[EMAIL PROTECTED]>
Cc: Pavel Machek <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
drivers/usb/core/hcd-pci.c | 2 +-
drivers/usb/host/ehci-pci.c | 6 ++++++
drivers/usb/host/ohci-pci.c | 5 +++++
drivers/usb/host/sl811-hcd.c | 9 +++++++--
drivers/usb/host/uhci-hcd.c | 4 ++++
5 files changed, 23 insertions(+), 3 deletions(-)
diff -puN drivers/usb/core/hcd-pci.c~pm-usb-hcds-use-pm_event_prethaw
drivers/usb/core/hcd-pci.c
--- a/drivers/usb/core/hcd-pci.c~pm-usb-hcds-use-pm_event_prethaw
+++ a/drivers/usb/core/hcd-pci.c
@@ -281,7 +281,7 @@ int usb_hcd_pci_suspend (struct pci_dev
(void) usb_hcd_pci_resume (dev);
}
- } else {
+ } else if (hcd->state != HC_STATE_HALT) {
dev_dbg (hcd->self.controller, "hcd state %d; not suspended\n",
hcd->state);
WARN_ON(1);
diff -puN drivers/usb/host/ehci-pci.c~pm-usb-hcds-use-pm_event_prethaw
drivers/usb/host/ehci-pci.c
--- a/drivers/usb/host/ehci-pci.c~pm-usb-hcds-use-pm_event_prethaw
+++ a/drivers/usb/host/ehci-pci.c
@@ -238,6 +238,12 @@ static int ehci_pci_suspend(struct usb_h
writel (0, &ehci->regs->intr_enable);
(void)readl(&ehci->regs->intr_enable);
+ /* make sure snapshot being resumed re-enumerates everything */
+ if (message.event == PM_EVENT_PRETHAW) {
+ ehci_halt(ehci);
+ ehci_reset(ehci);
+ }
+
clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
bail:
spin_unlock_irqrestore (&ehci->lock, flags);
diff -puN drivers/usb/host/ohci-pci.c~pm-usb-hcds-use-pm_event_prethaw
drivers/usb/host/ohci-pci.c
--- a/drivers/usb/host/ohci-pci.c~pm-usb-hcds-use-pm_event_prethaw
+++ a/drivers/usb/host/ohci-pci.c
@@ -135,6 +135,11 @@ static int ohci_pci_suspend (struct usb_
}
ohci_writel(ohci, OHCI_INTR_MIE, &ohci->regs->intrdisable);
(void)ohci_readl(ohci, &ohci->regs->intrdisable);
+
+ /* make sure snapshot being resumed re-enumerates everything */
+ if (message.event == PM_EVENT_PRETHAW)
+ ohci_usb_reset(ohci);
+
clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
bail:
spin_unlock_irqrestore (&ohci->lock, flags);
diff -puN drivers/usb/host/sl811-hcd.c~pm-usb-hcds-use-pm_event_prethaw
drivers/usb/host/sl811-hcd.c
--- a/drivers/usb/host/sl811-hcd.c~pm-usb-hcds-use-pm_event_prethaw
+++ a/drivers/usb/host/sl811-hcd.c
@@ -1783,10 +1783,15 @@ sl811h_suspend(struct platform_device *d
struct sl811 *sl811 = hcd_to_sl811(hcd);
int retval = 0;
- if (state.event == PM_EVENT_FREEZE)
+ switch (state.event) {
+ case PM_EVENT_FREEZE:
retval = sl811h_bus_suspend(hcd);
- else if (state.event == PM_EVENT_SUSPEND)
+ break;
+ case PM_EVENT_SUSPEND:
+ case PM_EVENT_PRETHAW: /* explicitly discard hw state */
port_power(sl811, 0);
+ break;
+ }
if (retval == 0)
dev->dev.power.power_state = state;
return retval;
diff -puN drivers/usb/host/uhci-hcd.c~pm-usb-hcds-use-pm_event_prethaw
drivers/usb/host/uhci-hcd.c
--- a/drivers/usb/host/uhci-hcd.c~pm-usb-hcds-use-pm_event_prethaw
+++ a/drivers/usb/host/uhci-hcd.c
@@ -734,6 +734,10 @@ static int uhci_suspend(struct usb_hcd *
/* FIXME: Enable non-PME# remote wakeup? */
+ /* make sure snapshot being resumed re-enumerates everything */
+ if (message.event == PM_EVENT_PRETHAW)
+ hc_died(uhci);
+
done_okay:
clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
done:
_
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
linux-usb-devel@lists.sourceforge.net
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
