lkml.org 
[lkml]   [2020]   [Jun]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 20/34] usb: musb: start session in resume for host port
    Date
    From: Bin Liu <b-liu@ti.com>

    commit 7f88a5ac393f39319f69b8b20cc8d5759878d1a1 upstream.

    Commit 17539f2f4f0b ("usb: musb: fix enumeration after resume") replaced
    musb_start() in musb_resume() to not override softconnect bit, but it
    doesn't restart the session for host port which was done in musb_start().
    The session could be disabled in musb_suspend(), which leads the host
    port doesn't stay in host mode.

    So let's start the session specifically for host port in musb_resume().

    Fixes: 17539f2f4f0b ("usb: musb: fix enumeration after resume")

    Cc: stable@vger.kernel.org
    Signed-off-by: Bin Liu <b-liu@ti.com>
    Link: https://lore.kernel.org/r/20200525025049.3400-3-b-liu@ti.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/usb/musb/musb_core.c | 7 +++++++
    1 file changed, 7 insertions(+)

    --- a/drivers/usb/musb/musb_core.c
    +++ b/drivers/usb/musb/musb_core.c
    @@ -2721,6 +2721,13 @@ static int musb_resume(struct device *de
    musb_enable_interrupts(musb);
    musb_platform_enable(musb);

    + /* session might be disabled in suspend */
    + if (musb->port_mode == MUSB_HOST &&
    + !(musb->ops->quirks & MUSB_PRESERVE_SESSION)) {
    + devctl |= MUSB_DEVCTL_SESSION;
    + musb_writeb(musb->mregs, MUSB_DEVCTL, devctl);
    + }
    +
    spin_lock_irqsave(&musb->lock, flags);
    error = musb_run_resume_work(musb);
    if (error)

    \
     
     \ /
      Last update: 2020-06-09 20:03    [W:3.206 / U:0.688 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site