lkml.org 
[lkml]   [2017]   [Dec]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 161/177] usb: musb: da8xx: fix babble condition handling
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Bin Liu <b-liu@ti.com>

    commit bd3486ded7a0c313a6575343e6c2b21d14476645 upstream.

    When babble condition happens, the musb controller might automatically
    turns off VBUS. On DA8xx platform, the controller generates drvvbus
    interrupt for turning off VBUS along with the babble interrupt.

    In this case, we should handle the babble interrupt first and recover
    from the babble condition.

    This change ignores the drvvbus interrupt if babble interrupt is also
    generated at the same time, so the babble recovery routine works
    properly.

    Signed-off-by: Bin Liu <b-liu@ti.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/usb/musb/da8xx.c | 10 +++++++++-
    1 file changed, 9 insertions(+), 1 deletion(-)

    --- a/drivers/usb/musb/da8xx.c
    +++ b/drivers/usb/musb/da8xx.c
    @@ -302,7 +302,15 @@ static irqreturn_t da8xx_musb_interrupt(
    musb->xceiv->otg->state = OTG_STATE_A_WAIT_VRISE;
    portstate(musb->port1_status |= USB_PORT_STAT_POWER);
    del_timer(&otg_workaround);
    - } else {
    + } else if (!(musb->int_usb & MUSB_INTR_BABBLE)){
    + /*
    + * When babble condition happens, drvvbus interrupt
    + * is also generated. Ignore this drvvbus interrupt
    + * and let babble interrupt handler recovers the
    + * controller; otherwise, the host-mode flag is lost
    + * due to the MUSB_DEV_MODE() call below and babble
    + * recovery logic will not called.
    + */
    musb->is_active = 0;
    MUSB_DEV_MODE(musb);
    otg->default_a = 0;

    \
     
     \ /
      Last update: 2017-12-18 18:02    [W:4.156 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site