public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [PATCH 1/7] usb: ehci-mx6: Add powerup_fixup implementation
@ 2020-06-29  2:13 Peng Fan
  2020-06-29  2:13 ` [PATCH 2/7] usb: ehci-mx6: Add i.MX8 OTG controller support Peng Fan
                   ` (7 more replies)
  0 siblings, 8 replies; 15+ messages in thread
From: Peng Fan @ 2020-06-29  2:13 UTC (permalink / raw)
  To: u-boot

From: Ye Li <ye.li@nxp.com>

When doing port reset, the PR bit of PORTSC1 will be automatically
cleared by our IP, but standard EHCI needs explicit clear by software. The
EHCI-HCD driver follow the EHCI specification, so after 50ms wait, it
clear the PR bit by writting to the PORTSC1 register with value loaded before
setting PR.

This sequence is ok for our IP when the delay time is exact. But when the timer
is slower, some bits like PE, PSPD have been set by controller automatically
after the PR is automatically cleared. So the writing to the PORTSC1 will overwrite
these bits set by controller. And eventually the driver gets wrong status.

We implement the powerup_fixup operation which delays 50ms and will check
the PR until it is cleared by controller. And will update the reg value which is written
to PORTSC register by EHCI-HCD driver. This is much safer than depending on the delay
time to be accurate and aligining with controller's behaiver.

Signed-off-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 drivers/usb/host/ehci-mx6.c | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index 5f84c7b91d..e654595683 100644
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -267,6 +267,25 @@ int usb_phy_mode(int port)
 }
 #endif
 
+static void ehci_mx6_powerup_fixup(struct ehci_ctrl *ctrl, uint32_t *status_reg,
+				   uint32_t *reg)
+{
+	u32 result;
+	int usec = 2000;
+
+	mdelay(50);
+
+	do {
+		result = ehci_readl(status_reg);
+		udelay(5);
+		if (!(result & EHCI_PS_PR))
+			break;
+		usec--;
+	} while (usec > 0);
+
+	*reg = ehci_readl(status_reg);
+}
+
 static void usb_oc_config(int index)
 {
 #if defined(CONFIG_MX6)
@@ -366,6 +385,10 @@ int ehci_mx6_common_init(struct usb_ehci *ehci, int index)
 }
 
 #if !CONFIG_IS_ENABLED(DM_USB)
+static const struct ehci_ops mx6_ehci_ops = {
+	.powerup_fixup		= ehci_mx6_powerup_fixup,
+};
+
 int ehci_hcd_init(int index, enum usb_init_type init,
 		struct ehci_hccr **hccr, struct ehci_hcor **hcor)
 {
@@ -394,6 +417,8 @@ int ehci_hcd_init(int index, enum usb_init_type init,
 	if (ret)
 		return ret;
 
+	ehci_set_controller_priv(index, NULL, &mx6_ehci_ops);
+
 	type = board_usb_phy_mode(index);
 
 	if (hccr && hcor) {
@@ -467,7 +492,8 @@ static int mx6_init_after_reset(struct ehci_ctrl *dev)
 }
 
 static const struct ehci_ops mx6_ehci_ops = {
-	.init_after_reset = mx6_init_after_reset
+	.powerup_fixup		= ehci_mx6_powerup_fixup,
+	.init_after_reset	= mx6_init_after_reset
 };
 
 static int ehci_usb_phy_mode(struct udevice *dev)
-- 
2.16.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2020-08-24 10:20 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-29  2:13 [PATCH 1/7] usb: ehci-mx6: Add powerup_fixup implementation Peng Fan
2020-06-29  2:13 ` [PATCH 2/7] usb: ehci-mx6: Add i.MX8 OTG controller support Peng Fan
2020-06-29  2:26   ` Marek Vasut
2020-06-29  8:24     ` Peng Fan
2020-06-29  8:50       ` Marek Vasut
2020-06-29  2:13 ` [PATCH 3/7] usb: ehci-mx6: Turn on the power domain of USB PHY Peng Fan
2020-06-29  2:27   ` Marek Vasut
2020-06-29  2:13 ` [PATCH 4/7] usb: ehci-mx6: Update driver to support i.MX8MM Peng Fan
2020-06-29  2:30   ` Marek Vasut
2020-06-29  2:13 ` [PATCH 5/7] usb: ehci-mx6: fix controller index for imx8m and imx8 Peng Fan
2020-06-29  2:34   ` Marek Vasut
2020-06-29  2:13 ` [PATCH 6/7] usb: ehci-mx6: Enable iMX EHCI driver for iMX8M Nano Peng Fan
2020-06-29  2:13 ` [PATCH 7/7] usb: ehci-mx6: configure usb out of suspend state Peng Fan
2020-06-29  2:21 ` [PATCH 1/7] usb: ehci-mx6: Add powerup_fixup implementation Marek Vasut
2020-08-24 10:20 ` Lukasz Majewski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox