lkml.org 
[lkml]   [2019]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 177/258] usb: musb: dsps: fix runtime pm for peripheral mode
    Date
    From: Bin Liu <b-liu@ti.com>

    [ Upstream commit 54578ee883e34d2d1c518d48f1c1e2dd3f387188 ]

    Since the runtime PM support was added in musb, dsps relies on the timer
    calling otg_timer() to activate the usb subsystem. However the driver
    doesn't enable the timer for peripheral port, then the peripheral port is
    unable to be enumerated by a host if the other usb port is disabled or in
    peripheral mode too.

    So let's start the timer for peripheral port too.

    Fixes: ea2f35c01d5e ("usb: musb: Fix sleeping function called from invalid context for hdrc glue")
    Acked-by: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Bin Liu <b-liu@ti.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/usb/musb/musb_dsps.c | 12 +++++++++---
    1 file changed, 9 insertions(+), 3 deletions(-)

    diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
    index 1e6d78b1334e..403eb97915f8 100644
    --- a/drivers/usb/musb/musb_dsps.c
    +++ b/drivers/usb/musb/musb_dsps.c
    @@ -181,9 +181,11 @@ static void dsps_musb_enable(struct musb *musb)

    musb_writel(reg_base, wrp->epintr_set, epmask);
    musb_writel(reg_base, wrp->coreintr_set, coremask);
    - /* start polling for ID change in dual-role idle mode */
    - if (musb->xceiv->otg->state == OTG_STATE_B_IDLE &&
    - musb->port_mode == MUSB_OTG)
    + /*
    + * start polling for runtime PM active and idle,
    + * and for ID change in dual-role idle mode.
    + */
    + if (musb->xceiv->otg->state == OTG_STATE_B_IDLE)
    dsps_mod_timer(glue, -1);
    }

    @@ -254,6 +256,10 @@ static int dsps_check_status(struct musb *musb, void *unused)
    musb->xceiv->otg->state = OTG_STATE_A_IDLE;
    MUSB_HST_MODE(musb);
    }
    +
    + if (musb->port_mode == MUSB_PERIPHERAL)
    + skip_session = 1;
    +
    if (!(devctl & MUSB_DEVCTL_SESSION) && !skip_session)
    musb_writeb(mregs, MUSB_DEVCTL,
    MUSB_DEVCTL_SESSION);
    --
    2.19.1
    \
     
     \ /
      Last update: 2019-01-28 18:14    [W:4.167 / U:0.184 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site