From: Roger Quadros <rogerq@ti.com> To: <balbi@kernel.org> Cc: <linux-usb@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <rogerq@ti.com> Subject: [PATCH v2] usb: dwc3: Prevent indefinite sleep in _dwc3_set_mode during suspend/resume Date: Fri, 9 Mar 2018 14:47:04 +0200 [thread overview] Message-ID: <a04fafee-7992-ce8b-55a9-afd4c9935462@ti.com> (raw) In-Reply-To: <1519730526-22274-1-git-send-email-rogerq@ti.com> 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> --- 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
WARNING: multiple messages have this Message-ID (diff)
From: Roger Quadros <rogerq@ti.com> To: balbi@kernel.org Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, rogerq@ti.com Subject: [v2] usb: dwc3: Prevent indefinite sleep in _dwc3_set_mode during suspend/resume Date: Fri, 9 Mar 2018 14:47:04 +0200 [thread overview] Message-ID: <a04fafee-7992-ce8b-55a9-afd4c9935462@ti.com> (raw) 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> --- 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:
next prev parent reply other threads:[~2018-03-09 12:47 UTC|newest] Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-02-27 11:22 [PATCH] usb: dwc3: Prevent indefinite sleep in _dwc3_set_mode during suspend/resume Roger Quadros 2018-02-27 11:22 ` Roger Quadros 2018-02-28 3:04 ` [PATCH] " Baolin Wang 2018-02-28 3:04 ` Baolin Wang 2018-02-28 9:55 ` [PATCH] " Roger Quadros 2018-02-28 9:55 ` Roger Quadros 2018-02-28 7:53 ` [PATCH] " Felipe Balbi 2018-02-28 7:53 ` Felipe Balbi 2018-02-28 9:59 ` [PATCH] " Roger Quadros 2018-02-28 9:59 ` Roger Quadros 2018-03-05 8:49 ` [PATCH] " Felipe Balbi 2018-03-05 8:49 ` Felipe Balbi 2018-03-05 9:45 ` [PATCH] " Roger Quadros 2018-03-05 9:45 ` Roger Quadros 2018-03-05 10:41 ` [PATCH] " Baolin Wang 2018-03-05 10:41 ` Baolin Wang 2018-03-05 11:03 ` [PATCH] " Roger Quadros 2018-03-05 11:03 ` Roger Quadros 2018-03-05 11:06 ` [PATCH] " Felipe Balbi 2018-03-05 11:06 ` Felipe Balbi 2018-03-05 11:14 ` [PATCH] " Roger Quadros 2018-03-05 11:14 ` Roger Quadros 2018-03-05 11:25 ` [PATCH] " Baolin Wang 2018-03-05 11:25 ` Baolin Wang 2018-03-05 11:27 ` [PATCH] " Felipe Balbi 2018-03-05 11:27 ` Felipe Balbi 2018-03-09 9:19 ` [PATCH] " Roger Quadros 2018-03-09 9:19 ` Roger Quadros 2018-03-09 9:23 ` [PATCH] " Felipe Balbi 2018-03-09 9:23 ` Felipe Balbi 2018-03-09 9:26 ` [PATCH] " Roger Quadros 2018-03-09 9:26 ` Roger Quadros 2018-03-09 9:49 ` [PATCH] " Roger Quadros 2018-03-09 9:49 ` Roger Quadros 2018-03-09 10:39 ` [PATCH] " Felipe Balbi 2018-03-09 10:39 ` Felipe Balbi 2018-03-09 10:36 ` [PATCH] " Felipe Balbi 2018-03-09 10:36 ` Felipe Balbi 2018-03-05 11:25 ` [PATCH] " Felipe Balbi 2018-03-05 11:25 ` Felipe Balbi 2018-03-09 12:47 ` Roger Quadros [this message] 2018-03-09 12:47 ` [v2] " Roger Quadros 2018-03-16 10:34 ` [PATCH v2] " Roger Quadros 2018-03-16 10:34 ` [v2] " Roger Quadros 2018-03-16 11:00 ` [PATCH v2] " Felipe Balbi 2018-03-16 11:00 ` [v2] " Felipe Balbi 2018-03-16 11:03 ` [PATCH v2] " Roger Quadros 2018-03-16 11:03 ` [v2] " Roger Quadros 2018-03-16 11:43 ` [PATCH v2] " Minas Harutyunyan 2018-03-16 11:43 ` [v2] " Minas Harutyunyan 2018-03-16 12:25 ` [PATCH v2] " Felipe Balbi 2018-03-16 12:25 ` [v2] " Felipe Balbi 2018-03-17 6:33 ` [PATCH v2] " Minas Harutyunyan 2018-03-17 6:33 ` [v2] " Minas Harutyunyan 2018-03-19 8:54 ` [PATCH v2] " Felipe Balbi 2018-03-19 8:54 ` [v2] " Felipe Balbi 2018-03-19 11:36 ` [PATCH v2] " Minas Harutyunyan 2018-03-19 11:36 ` [v2] " Minas Harutyunyan 2018-03-19 13:53 ` [PATCH v2] " Minas Harutyunyan 2018-03-19 13:53 ` [v2] " Minas Harutyunyan 2018-04-10 6:29 ` [PATCH v2] " Minas Harutyunyan 2018-04-10 6:29 ` [v2] " Minas Harutyunyan 2018-04-10 7:31 ` [PATCH v2] " Felipe Balbi 2018-04-10 7:31 ` [v2] " Felipe Balbi
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=a04fafee-7992-ce8b-55a9-afd4c9935462@ti.com \ --to=rogerq@ti.com \ --cc=balbi@kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-usb@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.