usb: musb: do multiple irq processing passes

[pandora-kernel.git] / drivers / usb / musb / musb_core.c

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 421ee5f..b7e37a5 100644 (file)
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -944,8 +944,8 @@ void musb_start(struct musb *musb)
                 */
                if ((devctl & MUSB_DEVCTL_VBUS) == MUSB_DEVCTL_VBUS)
                        musb->is_active = 1;
-               else
-                       devctl |= MUSB_DEVCTL_SESSION;
+               //else
+               //      devctl |= MUSB_DEVCTL_SESSION;
 
        } else if (is_host_enabled(musb)) {
                /* assume ID pin is hard-wired to ground */
@@ -1518,15 +1518,22 @@ static irqreturn_t generic_interrupt(int irq, void *__hci)
        unsigned long   flags;
        irqreturn_t     retval = IRQ_NONE;
        struct musb     *musb = __hci;
+       int             i;
 
        spin_lock_irqsave(&musb->lock, flags);
 
-       musb->int_usb = musb_readb(musb->mregs, MUSB_INTRUSB);
-       musb->int_tx = musb_readw(musb->mregs, MUSB_INTRTX);
-       musb->int_rx = musb_readw(musb->mregs, MUSB_INTRRX);
+       for (i = 0; i < 8; i++) {
+               musb->int_usb = musb_readb(musb->mregs, MUSB_INTRUSB);
+               /* SOF is not enabled, but status is still often set */
+               musb->int_usb &= ~MUSB_INTR_SOF;
+               musb->int_tx = musb_readw(musb->mregs, MUSB_INTRTX);
+               musb->int_rx = musb_readw(musb->mregs, MUSB_INTRRX);
 
-       if (musb->int_usb || musb->int_tx || musb->int_rx)
-               retval = musb_interrupt(musb);
+               if (musb->int_usb || musb->int_tx || musb->int_rx)
+                       retval = musb_interrupt(musb);
+               else
+                       break;
+       }
 
        spin_unlock_irqrestore(&musb->lock, flags);
 
@@ -1815,6 +1822,8 @@ static void musb_vbus_workaround_work(struct work_struct *work)
        if (musb_ulpi_access.write == NULL)
                return;
 
+       pm_runtime_get_sync(musb->controller);
+
        devctl = musb_readb(musb->mregs, MUSB_DEVCTL);
 
        /*
@@ -1837,6 +1846,8 @@ static void musb_vbus_workaround_work(struct work_struct *work)
                //if (ret)
                //      dev_err(musb->controller, "VBUS workaround error\n");
        }
+
+       pm_runtime_put(musb->controller);
 }
 
 /* --------------------------------------------------------------------------
@@ -2366,7 +2377,7 @@ static int musb_suspend(struct device *dev)
 
        spin_lock_irqsave(&musb->lock, flags);
 
-       if (is_peripheral_active(musb)) {
+       {
                /* FIXME force disconnect unless we know USB will wake
                 * the system up quickly enough to respond ...
                 */
@@ -2384,10 +2395,6 @@ static int musb_suspend(struct device *dev)
                                pm_usage_count);
                        ret = -EBUSY;
                }
-       } else if (is_host_active(musb)) {
-               /* we know all the children are suspended; sometimes
-                * they will even be wakeup-enabled.
-                */
        }
 
        spin_unlock_irqrestore(&musb->lock, flags);