Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Mon, 28 Jan 2019 11:09:50 -0600
From:   Bin Liu <b-liu@ti.com>
To:     Sasha Levin <sashal@kernel.org>
CC:     <linux-kernel@vger.kernel.org>, <stable@vger.kernel.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        <linux-usb@vger.kernel.org>
Subject: Re: [PATCH AUTOSEL 4.19 177/258] usb: musb: dsps: fix runtime pm for
 peripheral mode
Message-ID: <20190128170950.GA29630@uda0271908>
Mail-Followup-To: Bin Liu <b-liu@ti.com>, Sasha Levin <sashal@kernel.org>,
        linux-kernel@vger.kernel.org, stable@vger.kernel.org,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        linux-usb@vger.kernel.org
References: <20190128155924.51521-1-sashal@kernel.org>
 <20190128155924.51521-177-sashal@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20190128155924.51521-177-sashal@kernel.org>
User-Agent: Mutt/1.5.21 (2010-09-15)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Hi Sasha,

On Mon, Jan 28, 2019 at 10:58:03AM -0500, Sasha Levin wrote:
> 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);

This backport won't apply to stables cleanly. I have sent the manual
backport [1] for v4.9+ a few weeks ago.

[1] https://marc.info/?l=linux-usb&m=154696698103763&w=2

Regards,
-Bin.