mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Jules Maselbas <jmaselbas@kalray.eu>
To: Barebox List <barebox@lists.infradead.org>
Cc: Jules Maselbas <jmaselbas@kalray.eu>,
	Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH v4 05/13] usb: dwc2: Rework timeout
Date: Tue, 11 Aug 2020 17:16:29 +0200	[thread overview]
Message-ID: <20200811151637.17705-6-jmaselbas@kalray.eu> (raw)
In-Reply-To: <20200811151637.17705-1-jmaselbas@kalray.eu>

Signed-off-by: Jules Maselbas <jmaselbas@kalray.eu>
---
 drivers/usb/dwc2/core.h | 22 ++++------------------
 drivers/usb/dwc2/host.c | 16 +++++++++++++++-
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
index 94f992cb1..a2ec3ff68 100644
--- a/drivers/usb/dwc2/core.h
+++ b/drivers/usb/dwc2/core.h
@@ -466,15 +466,8 @@ static inline void dwc2_writel(struct dwc2 *dwc2, u32 value, u32 offset)
 static inline int dwc2_wait_bit_set(struct dwc2 *dwc2, u32 offset, u32 mask,
 			    u32 timeout)
 {
-	u32 i;
-
-	for (i = 0; i < timeout; i++) {
-		if (dwc2_readl(dwc2, offset) & mask)
-			return 0;
-		udelay(1);
-	}
-
-	return -ETIMEDOUT;
+	return wait_on_timeout(timeout * USECOND,
+			dwc2_readl(dwc2, offset) & mask);
 }
 
 /**
@@ -489,15 +482,8 @@ static inline int dwc2_wait_bit_set(struct dwc2 *dwc2, u32 offset, u32 mask,
 static inline int dwc2_wait_bit_clear(struct dwc2 *dwc2, u32 offset, u32 mask,
 			    u32 timeout)
 {
-	u32 i;
-
-	for (i = 0; i < timeout; i++) {
-		if (!(dwc2_readl(dwc2, offset) & mask))
-			return 0;
-		udelay(1);
-	}
-
-	return -ETIMEDOUT;
+	return wait_on_timeout(timeout * USECOND,
+			!(dwc2_readl(dwc2, offset) & mask));
 }
 
 /*
diff --git a/drivers/usb/dwc2/host.c b/drivers/usb/dwc2/host.c
index 7eaa7c31c..ea2facbc8 100644
--- a/drivers/usb/dwc2/host.c
+++ b/drivers/usb/dwc2/host.c
@@ -383,6 +383,8 @@ static int dwc2_submit_bulk_msg(struct usb_device *udev, unsigned long pipe,
 	int in = usb_pipein(pipe);
 	u8 *pid;
 	u8 hc = DWC2_HC_CHANNEL;
+	uint64_t start;
+	int ret;
 
 	if ((devnum >= MAX_DEVICE) || (devnum == dwc2->root_hub_devnum)) {
 		udev->status = 0;
@@ -394,7 +396,19 @@ static int dwc2_submit_bulk_msg(struct usb_device *udev, unsigned long pipe,
 	else
 		pid = &dwc2->out_data_toggle[devnum][ep];
 
-	return dwc2_submit_packet(dwc2, udev, hc, pipe, pid, in, buffer, len);
+	start = get_time_ns();
+	do {
+		ret = dwc2_submit_packet(dwc2, udev, hc, pipe, pid, in,
+					 buffer, len);
+	} while (ret == -EAGAIN && !is_timeout(start, timeout * MSECOND));
+	if (ret == -EAGAIN) {
+		dwc2_err(dwc2, "Timeout on bulk endpoint\n");
+		ret = -ETIMEDOUT;
+	}
+
+	dwc2_dbg(dwc2, "%s: return %d\n", __func__, ret);
+
+	return ret;
 }
 
 static int dwc2_submit_int_msg(struct usb_device *udev, unsigned long pipe,
-- 
2.17.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2020-08-11 15:16 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-11 15:16 [PATCH v4 00/13] usb: dwc2: Add host and gadget driver Jules Maselbas
2020-08-11 15:16 ` [PATCH v4 01/13] Revert "usb: Add dwc2 host driver" Jules Maselbas
2020-08-11 15:16 ` [PATCH v4 02/13] usb: dwc2: Add host controller driver Jules Maselbas
2020-08-14  6:21   ` Sascha Hauer
2020-08-14  8:15     ` Jules Maselbas
2020-08-14 13:12       ` Sascha Hauer
2020-08-11 15:16 ` [PATCH v4 03/13] usb: dwc2: host: Read dr_mode from device tree Jules Maselbas
2020-08-11 15:16 ` [PATCH v4 04/13] usb: dwc2: Rework roothub interface Jules Maselbas
2020-08-11 15:16 ` Jules Maselbas [this message]
2020-08-11 15:16 ` [PATCH v4 06/13] usb: dwc2: host: Handle dma mapping errors Jules Maselbas
2020-08-11 15:16 ` [PATCH v4 07/13] usb: dwc2: host: Dynamic fifo size support from Linux Jules Maselbas
2020-08-11 15:16 ` [PATCH v4 08/13] usb: dwc2: host: Fix toggle reset Jules Maselbas
2020-08-11 15:16 ` [PATCH v4 09/13] usb: dwc2: host: Rewrite dwc2_hc_init Jules Maselbas
2020-08-11 15:16 ` [PATCH v4 10/13] usb: dwc2: Add function to flush tx fifo Jules Maselbas
2020-08-11 15:16 ` [PATCH v4 11/13] usb: dwc2: Add structure for gadget driver Jules Maselbas
2020-08-11 15:16 ` [PATCH v4 12/13] usb: dwc2: Add " Jules Maselbas
2020-08-11 15:16 ` [PATCH v4 13/13] usb: dwc2: Use register_otg_device Jules Maselbas
2020-08-14 13:12 ` [PATCH v4 00/13] usb: dwc2: Add host and gadget driver Sascha Hauer

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=20200811151637.17705-6-jmaselbas@kalray.eu \
    --to=jmaselbas@kalray.eu \
    --cc=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.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