EHCI: centralize controller suspend/resume

This patch (as1563) removes a lot of duplicated code by moving the
EHCI controller suspend/resume routines into the core driver, where
the various platform drivers can invoke them as needed.

Not only does this simplify these platform drivers, this also makes it
easier for other platform drivers to add suspend/resume support in the
future.

Note: The patch does not touch the ehci-fsl.c file, because its
approach to suspend and resume is so different from all the others.
It will have to be handled specially by its maintainer.

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

1 files changed, 3 insertions, 71 deletions

diff --git a/drivers/usb/host/ehci-sead3.c b/drivers/usb/host/ehci-sead3.c
index cc199e87a7a9..58c96bd50d22 100644
--- a/drivers/usb/host/ehci-sead3.c
+++ b/drivers/usb/host/ehci-sead3.c
@@ -160,84 +160,16 @@ static int ehci_hcd_sead3_drv_remove(struct platform_device *pdev)
 static int ehci_hcd_sead3_drv_suspend(struct device *dev)
 {
         struct usb_hcd *hcd = dev_get_drvdata(dev);
-        struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-        unsigned long flags;
-        int rc = 0;
-
-        if (time_before(jiffies, ehci->next_statechange))
-                msleep(20);
-
-        /* Root hub was already suspended. Disable irq emission and
-         * mark HW unaccessible.  The PM and USB cores make sure that
-         * the root hub is either suspended or stopped.
-         */
-        ehci_prepare_ports_for_controller_suspend(ehci, device_may_wakeup(dev));
-        spin_lock_irqsave(&ehci->lock, flags);
-        ehci_writel(ehci, 0, &ehci->regs->intr_enable);
-        (void)ehci_readl(ehci, &ehci->regs->intr_enable);
-
-        clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
-        spin_unlock_irqrestore(&ehci->lock, flags);
+        bool do_wakeup = device_may_wakeup(dev);
 
-        /* could save FLADJ in case of Vaux power loss
-         * ... we'd only use it to handle clock skew
-         */
-
-        return rc;
+        return ehci_suspend(hcd, do_wakeup);
 }
 
 static int ehci_hcd_sead3_drv_resume(struct device *dev)
 {
         struct usb_hcd *hcd = dev_get_drvdata(dev);
-        struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-
-        /* maybe restore FLADJ. */
-
-        if (time_before(jiffies, ehci->next_statechange))
-                msleep(100);
-
-        /* Mark hardware accessible again as we are out of D3 state by now */
-        set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
-
-        /* If CF is still set, we maintained PCI Vaux power.
-         * Just undo the effect of ehci_pci_suspend().
-         */
-        if (ehci_readl(ehci, &ehci->regs->configured_flag) == FLAG_CF) {
-                int     mask = INTR_MASK;
-
-                ehci_prepare_ports_for_controller_resume(ehci);
-                if (!hcd->self.root_hub->do_remote_wakeup)
-                        mask &= ~STS_PCD;
-                ehci_writel(ehci, mask, &ehci->regs->intr_enable);
-                ehci_readl(ehci, &ehci->regs->intr_enable);
-                return 0;
-        }
-
-        ehci_dbg(ehci, "lost power, restarting\n");
-        usb_root_hub_lost_power(hcd->self.root_hub);
-
-        /* Else reset, to cope with power loss or flush-to-storage
-         * style "resume" having let BIOS kick in during reboot.
-         */
-        (void) ehci_halt(ehci);
-        (void) ehci_reset(ehci);
-
-        /* emptying the schedule aborts any urbs */
-        spin_lock_irq(&ehci->lock);
-        if (ehci->reclaim)
-                end_unlink_async(ehci);
-        ehci_work(ehci);
-        spin_unlock_irq(&ehci->lock);
-
-        ehci_writel(ehci, ehci->command, &ehci->regs->command);
-        ehci_writel(ehci, FLAG_CF, &ehci->regs->configured_flag);
-        ehci_readl(ehci, &ehci->regs->command); /* unblock posted writes */
-
-        /* here we "know" root ports should always stay powered */
-        ehci_port_power(ehci, 1);
-
-        ehci->rh_state = EHCI_RH_SUSPENDED;
 
+        ehci_resume(hcd, false);
         return 0;
 }