From: Michael Grzeschik <m.grzeschik@pengutronix.de>
To: Thinh Nguyen <Thinh.Nguyen@synopsys.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
Michael Grzeschik <m.grzeschik@pengutronix.de>
Subject: [PATCH 2/3] usb: dwc3: gadget: check drained isoc ep
Date: Thu, 07 Mar 2024 16:22:04 +0100 [thread overview]
Message-ID: <20240307-dwc3-gadget-complete-irq-v1-2-4fe9ac0ba2b7@pengutronix.de> (raw)
In-Reply-To: <20240307-dwc3-gadget-complete-irq-v1-0-4fe9ac0ba2b7@pengutronix.de>
To avoid a potential underrun of an currently drained transfer
we add a check for that scenario in the dwc3_gadget_endpoint_trbs_complete
function. In the case of an empty trb ring, we call the stop_transfer
cmd and avoid the underrun to occur.
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
---
drivers/usb/dwc3/gadget.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index b9fce7b1dcdec..f22b68a0b2dac 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -3568,8 +3568,23 @@ static bool dwc3_gadget_endpoint_trbs_complete(struct dwc3_ep *dep,
{
struct dwc3 *dwc = dep->dwc;
bool no_started_trb = true;
+ unsigned int transfer_in_flight = 0;
+
+ /* It is possible that the interrupt thread was delayed by
+ * scheduling in the system, and therefor the HW has already
+ * run dry. In that case the last trb in the queue is already
+ * handled by the hw. By checking the HWO bit we know to restart
+ * the whole transfer. The condition to appear is more likely
+ * if not every req has the IOC bit set and therefor does not
+ * trigger the interrupt thread frequently.
+ */
+ if (dep->number && usb_endpoint_xfer_isoc(dep->endpoint.desc)) {
+ struct dwc3_trb *trb = dwc3_ep_prev_trb(dep, dep->trb_enqueue);
+
+ transfer_in_flight = trb->ctrl & DWC3_TRB_CTRL_HWO;
+ }
- if (status == -EXDEV)
+ if (status == -EXDEV || !transfer_in_flight)
dwc3_stop_active_transfer(dep, true, true);
dwc3_gadget_ep_cleanup_completed_requests(dep, event, status);
--
2.39.2
next prev parent reply other threads:[~2024-03-07 15:22 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-07 15:22 [PATCH 0/3] usb: dwc3: gadget: improve abbort transfer abort by adding more conditions Michael Grzeschik
2024-03-07 15:22 ` [PATCH 1/3] usb: dwc3: gadget: reclaim the whole started list when request was missed Michael Grzeschik
2024-03-07 15:22 ` Michael Grzeschik [this message]
2024-03-07 15:22 ` [PATCH 3/3] usb: dwc3: gadget: check the whole started queue for missed requests in complete Michael Grzeschik
2024-04-02 21:45 ` [PATCH 0/3] usb: dwc3: gadget: improve abbort transfer abort by adding more conditions Michael Grzeschik
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=20240307-dwc3-gadget-complete-irq-v1-2-4fe9ac0ba2b7@pengutronix.de \
--to=m.grzeschik@pengutronix.de \
--cc=Thinh.Nguyen@synopsys.com \
--cc=gregkh@linuxfoundation.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).