usb: musb: make error handling work

[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 35e30e1..ccb198c 100644 (file)
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -456,8 +456,8 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
 
                                if (power & MUSB_POWER_SUSPENDM) {
                                        /* spurious */
-                                       musb->int_usb &= ~MUSB_INTR_SUSPEND;
-                                       dev_dbg(musb->controller, "Spurious SUSPENDM\n");
+                                       int_usb &= ~MUSB_INTR_SUSPEND;
+                                       dev_err(musb->controller, "Spurious SUSPENDM\n");
                                        break;
                                }
 
@@ -500,14 +500,20 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
                                if ((devctl & MUSB_DEVCTL_VBUS)
                                                != (3 << MUSB_DEVCTL_VBUS_SHIFT)
                                                ) {
-                                       musb->int_usb |= MUSB_INTR_DISCONNECT;
-                                       musb->int_usb &= ~MUSB_INTR_SUSPEND;
+                                       if (!(int_usb & MUSB_INTR_DISCONNECT))
+                                               dev_err(musb->controller,
+                                                 "disconnect while suspended?\n");
+                                       int_usb |= MUSB_INTR_DISCONNECT;
+                                       int_usb &= ~MUSB_INTR_SUSPEND;
                                        break;
                                }
                                musb_g_resume(musb);
                                break;
                        case OTG_STATE_B_IDLE:
-                               musb->int_usb &= ~MUSB_INTR_SUSPEND;
+                               if (int_usb & MUSB_INTR_SUSPEND)
+                                       dev_err(musb->controller,
+                                               "bogus suspend+resume?\n");
+                               int_usb &= ~MUSB_INTR_SUSPEND;
                                break;
                        default:
                                WARNING("bogus %s RESUME (%s)\n",
@@ -592,9 +598,10 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
                        break;
                }
 
-               dev_dbg(musb->controller, "VBUS_ERROR in %s (%02x, %s), retry #%d, port1 %08x\n",
+               dev_printk(ignore ? KERN_DEBUG : KERN_ERR, musb->controller,
+                               "VBUS_ERROR in %s (%02x, %02x, %s), retry #%d, port1 %08x\n",
                                otg_state_string(musb->xceiv->state),
-                               devctl,
+                               devctl, power,
                                ({ char *s;
                                switch (devctl & MUSB_DEVCTL_VBUS) {
                                case 0 << MUSB_DEVCTL_VBUS_SHIFT:
@@ -714,7 +721,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
                switch (musb->xceiv->state) {
                case OTG_STATE_B_PERIPHERAL:
                        if (int_usb & MUSB_INTR_SUSPEND) {
-                               dev_dbg(musb->controller, "HNP: SUSPEND+CONNECT, now b_host\n");
+                               dev_err(musb->controller, "HNP: SUSPEND+CONNECT, now b_host\n");
                                int_usb &= ~MUSB_INTR_SUSPEND;
                                goto b_host;
                        } else
@@ -943,8 +950,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 */
@@ -1517,15 +1524,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);
 
@@ -1814,6 +1828,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);
 
        /*
@@ -1836,6 +1852,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);
 }
 
 /* --------------------------------------------------------------------------
@@ -2066,9 +2084,13 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
                                ? 'B' : 'A'));
 
        } else /* peripheral is enabled */ {
-               MUSB_DEV_MODE(musb);
-               musb->xceiv->default_a = 0;
-               musb->xceiv->state = OTG_STATE_B_IDLE;
+               if (musb->xceiv->default_a) {
+                       MUSB_HST_MODE(musb);
+                       musb->xceiv->state = OTG_STATE_A_IDLE;
+               } else {
+                       MUSB_DEV_MODE(musb);
+                       musb->xceiv->state = OTG_STATE_B_IDLE;
+               }
 
                status = musb_gadget_setup(musb);
 
@@ -2361,7 +2383,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 ...
                 */
@@ -2379,10 +2401,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);