USB: EHCI, OHCI: handover changes

This patch (as887) changes the way ehci-hcd and ohci-hcd handle a loss
of VBUS power during suspend.  In order for the USB-persist facility
to work correctly, it is necessary for low- and full-speed devices
attached to a high-speed port to be handed back to the companion
controller during resume processing.

This entails three changes: adding code to ehci-hcd to perform the
handover, removing code from ohci-hcd to turn off ports during
root-hub reinit, and adding code to ohci-hcd to turn on ports during
PCI controller resume.  (Other bus glue resume methods for platforms
supporting high-speed controllers would need a similar change, if any
existed.)

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 2 insertions, 19 deletions

diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index a66637e725f3..ce05e5f7bed6 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -510,15 +510,7 @@ static int ohci_run (struct ohci_hcd *ohci)
         // flush the writes
         (void) ohci_readl (ohci, &ohci->regs->control);
         msleep(temp);
-        temp = roothub_a (ohci);
-        if (!(temp & RH_A_NPS)) {
-                /* power down each port */
-                for (temp = 0; temp < ohci->num_ports; temp++)
-                        ohci_writel (ohci, RH_PS_LSDA,
-                                &ohci->regs->roothub.portstatus [temp]);
-        }
-        // flush those writes
-        (void) ohci_readl (ohci, &ohci->regs->control);
+
         memset (ohci->hcca, 0, sizeof (struct ohci_hcca));
 
         /* 2msec timelimit here means no irqs/preempt */
@@ -826,17 +818,8 @@ static int ohci_restart (struct ohci_hcd *ohci)
         if ((temp = ohci_run (ohci)) < 0) {
                 ohci_err (ohci, "can't restart, %d\n", temp);
                 return temp;
-        } else {
-                /* here we "know" root ports should always stay powered,
-                 * and that if we try to turn them back on the root hub
-                 * will respond to CSC processing.
-                 */
-                i = ohci->num_ports;
-                while (i--)
-                        ohci_writel (ohci, RH_PS_PSS,
-                                &ohci->regs->roothub.portstatus [i]);
-                ohci_dbg (ohci, "restart complete\n");
         }
+        ohci_dbg(ohci, "restart complete\n");
         return 0;
 }
 #endif