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;
Subject: Re: [PATCH v2] usb: dwc3: Prevent indefinite sleep in _dwc3_set_mode
 during suspend/resume
To:     <balbi@kernel.org>
CC:     <linux-usb@vger.kernel.org>, <linux-kernel@vger.kernel.org>
References: <1519730526-22274-1-git-send-email-rogerq@ti.com>
 <a04fafee-7992-ce8b-55a9-afd4c9935462@ti.com>
From:   Roger Quadros <rogerq@ti.com>
Message-ID: <69517684-bd39-e945-0c9e-ccd52b8050d5@ti.com>
Date:   Fri, 16 Mar 2018 12:34:10 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.6.0
MIME-Version: 1.0
In-Reply-To: <a04fafee-7992-ce8b-55a9-afd4c9935462@ti.com>
Content-Type: text/plain; charset="utf-8"
Content-Language: en-GB
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Hi Felipe,

On 09/03/18 14:47, Roger Quadros wrote:
> In the following test we get stuck by sleeping forever in _dwc3_set_mode()
> after which dual-role switching doesn't work.
> 
> On dra7-evm's dual-role port,
> - Load g_zero gadget driver and enumerate to host
> - suspend to mem
> - disconnect USB cable to host and connect otg cable with Pen drive in it.
> - resume system
> - we sleep indefinitely in _dwc3_set_mode due to.
>   dwc3_gadget_exit()->usb_del_gadget_udc()->udc_stop()->
> 	dwc3_gadget_stop()->wait_event_lock_irq()
> 
> To fix this instead of waiting indefinitely with wait_event_lock_irq()
> we use wait_event_interruptible_lock_irq_timeout() and print
> and error message if there was a timeout.
> 
> Signed-off-by: Roger Quadros <rogerq@ti.com>

Thanks for picking this for -next.
Is it better to have this in v4.16-rc fixes?
and also stable? v4.12+

> ---
> 
> Changelog:
> 
> v2:
> - use wait_event_interruptible_lock_irq_timeout() instead of wait_event_lock_irq()
> 
>  drivers/usb/dwc3/gadget.c | 23 ++++++++++++++++++++---
>  1 file changed, 20 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
> index 2bda4eb..7c3a6e4 100644
> --- a/drivers/usb/dwc3/gadget.c
> +++ b/drivers/usb/dwc3/gadget.c
> @@ -1950,6 +1950,7 @@ static int dwc3_gadget_stop(struct usb_gadget *g)
>  	struct dwc3		*dwc = gadget_to_dwc(g);
>  	unsigned long		flags;
>  	int			epnum;
> +	u32			tmo_eps = 0;
>  
>  	spin_lock_irqsave(&dwc->lock, flags);
>  
> @@ -1960,6 +1961,7 @@ static int dwc3_gadget_stop(struct usb_gadget *g)
>  
>  	for (epnum = 2; epnum < DWC3_ENDPOINTS_NUM; epnum++) {
>  		struct dwc3_ep  *dep = dwc->eps[epnum];
> +		int ret;
>  
>  		if (!dep)
>  			continue;
> @@ -1967,9 +1969,24 @@ static int dwc3_gadget_stop(struct usb_gadget *g)
>  		if (!(dep->flags & DWC3_EP_END_TRANSFER_PENDING))
>  			continue;
>  
> -		wait_event_lock_irq(dep->wait_end_transfer,
> -				    !(dep->flags & DWC3_EP_END_TRANSFER_PENDING),
> -				    dwc->lock);
> +		ret = wait_event_interruptible_lock_irq_timeout(dep->wait_end_transfer,
> +			    !(dep->flags & DWC3_EP_END_TRANSFER_PENDING),
> +			    dwc->lock, msecs_to_jiffies(5));
> +
> +		if (ret <= 0) {
> +			/* Timed out or interrupted! There's nothing much
> +			 * we can do so we just log here and print which
> +			 * endpoints timed out at the end.
> +			 */
> +			tmo_eps |= 1 << epnum;
> +			dep->flags &= DWC3_EP_END_TRANSFER_PENDING;
> +		}
> +	}
> +
> +	if (tmo_eps) {
> +		dev_err(dwc->dev,
> +			"end transfer timed out on endpoints 0x%x [bitmap]\n",
> +			tmo_eps);
>  	}
>  
>  out:
> 

-- 
cheers,
-roger

Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki