From: Jules Maselbas <jmaselbas@kalray.eu>
To: barebox@lists.infradead.org
Cc: Jules Maselbas <jmaselbas@kalray.eu>
Subject: [PATCH 5/5] usb: dwc2: Rework wait for host mode during core reset
Date: Fri, 12 Mar 2021 17:24:32 +0100 [thread overview]
Message-ID: <20210312162432.9189-5-jmaselbas@kalray.eu> (raw)
In-Reply-To: <20210312162432.9189-1-jmaselbas@kalray.eu>
Replace the unconditional delay of 100ms during core_reset by
a call to dwc2_wait_for_mode() when iddig filter is enabled,
as done in Linux.
The uses of mdelay comes from the porting of u-boot's driver.
Cc: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Jules Maselbas <jmaselbas@kalray.eu>
---
drivers/usb/dwc2/core.c | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c
index 24efe5a41..5d04a07b0 100644
--- a/drivers/usb/dwc2/core.c
+++ b/drivers/usb/dwc2/core.c
@@ -764,16 +764,16 @@ int dwc2_core_reset(struct dwc2 *dwc2)
* Determine whether we will go back into host mode after a
* reset and account for this delay after the reset.
*/
- {
- u32 gotgctl = dwc2_readl(dwc2, GOTGCTL);
- u32 gusbcfg = dwc2_readl(dwc2, GUSBCFG);
-
- if (!(gotgctl & GOTGCTL_CONID_B) ||
- (gusbcfg & GUSBCFG_FORCEHOSTMODE)) {
- dwc2_dbg(dwc2, "HOST MODE\n");
- wait_for_host_mode = true;
- }
+ if (dwc2_iddig_filter_enabled(dwc2)) {
+ u32 gotgctl = dwc2_readl(dwc2, GOTGCTL);
+ u32 gusbcfg = dwc2_readl(dwc2, GUSBCFG);
+
+ if (!(gotgctl & GOTGCTL_CONID_B) ||
+ (gusbcfg & GUSBCFG_FORCEHOSTMODE)) {
+ wait_for_host_mode = true;
+ }
}
+
/* Core Soft Reset */
greset = dwc2_readl(dwc2, GRSTCTL);
greset |= GRSTCTL_CSFTRST;
@@ -786,12 +786,8 @@ int dwc2_core_reset(struct dwc2 *dwc2)
return ret;
}
- /*
- * Wait for core to come out of reset.
- * NOTE: This long sleep is _very_ important, otherwise the core will
- * not stay in host mode after a connector ID change!
- */
- mdelay(100);
+ if (wait_for_host_mode)
+ dwc2_wait_for_mode(dwc2, wait_for_host_mode);
return 0;
}
--
2.17.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2021-03-12 16:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-12 16:24 [PATCH 1/5] usb: dwc2: Make dwc2_wait_bit_set wait all bits in mask Jules Maselbas
2021-03-12 16:24 ` [PATCH 2/5] usb: dwc2: Replace pr_info with dev_warn Jules Maselbas
2021-03-12 16:24 ` [PATCH 3/5] usb: dwc2: Rework dwc2_wait_for_mode to use wait_on_timeout Jules Maselbas
2021-03-12 16:24 ` [PATCH 4/5] usb: dwc2: Move wait_for_mode and iddig_filter_enabled to core Jules Maselbas
2021-03-12 16:24 ` Jules Maselbas [this message]
2021-03-15 8:51 ` [PATCH 1/5] usb: dwc2: Make dwc2_wait_bit_set wait all bits in mask 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=20210312162432.9189-5-jmaselbas@kalray.eu \
--to=jmaselbas@kalray.eu \
--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