Skip to contentSkip to conversation

powerpc/usb: fix bug of CPU halt when missing USB PHY clock

PATCH New Shengzhou Liu 4 participants 9 messages Feb 1, 2012 – Oct 18, 2012

Subsystems (2)
USB USB ehci driver
lore
Share & tools
lore

Shengzhou Liu

author
#0 lore raw

PATCH 1/1 powerpc/usb: fix bug of CPU halt when missing USB PHY clock

when missing USB PHY clock and issuing "usb start" at u-boot prompt, writing to or_portsc register will cause CPU halt. We should check USBGP[PHY_CLK_VALID] bit at the first time in ehci_hcd_init() to avoid CPU hang in this case.

Signed-off-by Shengzhou Liu <[email protected]>
---
 drivers/usb/host/ehci-fsl.c |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)
drivers/usb/host/ehci-fsl.c +19 -3
index b2d294e..cc29375 100644
@@ -31,6 +31,18 @@
 #include "ehci.h"
 #include "ehci-core.h"
 
+/* Check USB PHY clock valid */
+static int usb_phy_clk_valid(struct usb_ehci *ehci)
+{
+	if ((!(in_be32(&ehci->control) & PHY_CLK_VALID)) &&
+			(!in_be32(&ehci->prictrl))) {
+		printf("WARNING: USB PHY clock invalid\n");
+		return 0;
+	} else {
+		return 1;
+	}
+}
+
 /*
  * Create the appropriate control structures to manage
  * a new EHCI host controller.

@@ -59,6 +71,9 @@ int ehci_hcd_init(void)
 	out_be32(&ehci->snoop1, SNOOP_SIZE_2GB);
 	out_be32(&ehci->snoop2, 0x80000000 | SNOOP_SIZE_2GB);
 
+	/* Enable interface. */
+	setbits_be32(&ehci->control, USB_EN);
+
 	/* Init phy */
 	if (hwconfig_sub("usb1", "phy_type"))
 		phy_type = hwconfig_subarg("usb1", "phy_type", &len);

@@ -82,6 +97,8 @@ int ehci_hcd_init(void)
 		setbits_be32(&ehci->control, UTMI_PHY_EN);
 		udelay(1000); /* delay required for PHY Clk to appear */
 #endif
+		if (!usb_phy_clk_valid(ehci))
+			return -1;
 		out_le32(&(hcor->or_portsc[0]), PORT_PTS_UTMI);
 	} else {
 #if defined(CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY)

@@ -89,12 +106,11 @@ int ehci_hcd_init(void)
 		setbits_be32(&ehci->control, PHY_CLK_SEL_ULPI);
 		udelay(1000); /* delay required for PHY Clk to appear */
 #endif
+		if (!usb_phy_clk_valid(ehci))
+			return -1;
 		out_le32(&(hcor->or_portsc[0]), PORT_PTS_ULPI);
 	}
 
-	/* Enable interface. */
-	setbits_be32(&ehci->control, USB_EN);
-
 	out_be32(&ehci->prictrl, 0x0000000c);
 	out_be32(&ehci->age_cnt_limit, 0x00000040);
 	out_be32(&ehci->sictrl, 0x00000001);
Signature · 1 line
1.6.4
#1 lore raw

PATCH 1/1 powerpc/usb: fix bug of CPU halt when missing USB PHY clock

Quoted 10 lines

when missing USB PHY clock and issuing "usb start" at u-boot prompt, writing to or_portsc register will cause CPU halt. We should check USBGP[PHY_CLK_VALID] bit at the first time in ehci_hcd_init() to avoid CPU hang in this case.

Signed-off-by Shengzhou Liu <[email protected]>
---
 drivers/usb/host/ehci-fsl.c |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

Hi,

what's the status of this patch/patchset?

Thanks
M

#2 lore raw

PATCH 1/1 powerpc/usb: fix bug of CPU halt when missing USB PHY clock

Quoted 20 lines

-----Original Message-----
From: Marek Vasut [mailto:marex at denx.de]
Sent: Monday, February 27, 2012 7:13 AM
To: u-boot at lists.denx.de
Cc: Liu Shengzhou-B36685
Subject: Re: [U-Boot] [PATCH] powerpc/usb: fix bug of CPU halt when missing USB PHY clock

Quoted 3 lines

when missing USB PHY clock and issuing "usb start" at u-boot prompt, writing to or_portsc register will cause CPU halt. We should check USBGP[PHY_CLK_VALID] bit at the first time in ehci_hcd_init() to

avoid

Quoted 7 lines

CPU hang in this case.

Signed-off-by Shengzhou Liu <[email protected]>
---
 drivers/usb/host/ehci-fsl.c |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)
Quoted 6 lines

Hi,

what's the status of this patch/patchset?

Thanks
M

Currently we found that usb CTRL_PHY_CLK_VALID bit breaks on P1022 platform, which not contains this bit.
- P1023/P3041/P5020 etc, have this bit
- P3060/4080/PSC913x do have this bit, but not mentioned in RM.
- P1022(perhaps and other) has no this bit
I'm waiting for the response from FSL silicon team to confirm whether there is other platform not including this bit or not, so this patch maybe have to be pending until I get confirmation.

Thanks,
Shengzhou

#3 lore raw

PATCH 1/1 powerpc/usb: fix bug of CPU halt when missing USB PHY clock

Pinging you on this, again. Also, I've now moved the patch to Marek's queue, instead of mine.

Quoted 42 lines · On Sun, Feb 26, 2012 at 8:44 PM, Liu Shengzhou-B36685 <[email protected]>…
Quoted 20 lines

-----Original Message-----
From: Marek Vasut [mailto:marex at denx.de]
Sent: Monday, February 27, 2012 7:13 AM
To: u-boot at lists.denx.de
Cc: Liu Shengzhou-B36685
Subject: Re: [U-Boot] [PATCH] powerpc/usb: fix bug of CPU halt when missing USB PHY clock

Quoted 3 lines

when missing USB PHY clock and issuing "usb start" at u-boot prompt, writing to or_portsc register will cause CPU halt. We should check USBGP[PHY_CLK_VALID] bit at the first time in ehci_hcd_init() to

avoid

Quoted 7 lines

CPU hang in this case.

Signed-off-by Shengzhou Liu <[email protected]>

---
?drivers/usb/host/ehci-fsl.c | ? 22 +++++++++++++++++++--- ?1 files changed, 19 insertions(+), 3 deletions(-)

Quoted 6 lines

Hi,

what's the status of this patch/patchset?

Thanks
M

Currently we found that usb CTRL_PHY_CLK_VALID bit breaks on P1022 platform, which not contains this bit. ?- P1023/P3041/P5020 etc, have this bit
?- P3060/4080/PSC913x do have this bit, but not mentioned in RM.
?- P1022(perhaps and other) has no this bit
I'm waiting for the response from FSL silicon team to confirm whether there is other platform not including this bit or not, so this patch maybe have to be pending until I get confirmation.

Thanks,
Shengzhou

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

#4 lore raw

PATCH 1/1 powerpc/usb: fix bug of CPU halt when missing USB PHY clock

Dear Andy Fleming,

Quoted 2 lines

Pinging you on this, again. Also, I've now moved the patch to Marek's queue, instead of mine.

Thanks! Did the FSL silicon team respond already?

Quoted 49 lines

On Sun, Feb 26, 2012 at 8:44 PM, Liu Shengzhou-B36685

Quoted 45 lines · <[email protected]> wrote:
Quoted 21 lines

-----Original Message-----
From: Marek Vasut [mailto:marex at denx.de]
Sent: Monday, February 27, 2012 7:13 AM
To: u-boot at lists.denx.de
Cc: Liu Shengzhou-B36685
Subject: Re: [U-Boot] [PATCH] powerpc/usb: fix bug of CPU halt when missing USB PHY clock

Quoted 3 lines

when missing USB PHY clock and issuing "usb start" at u-boot prompt, writing to or_portsc register will cause CPU halt. We should check USBGP[PHY_CLK_VALID] bit at the first time in ehci_hcd_init() to

avoid

Quoted 6 lines

CPU hang in this case.

Signed-off-by Shengzhou Liu <[email protected]>
---
 drivers/usb/host/ehci-fsl.c |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)
Quoted 6 lines

Hi,

what's the status of this patch/patchset?

Thanks
M

Currently we found that usb CTRL_PHY_CLK_VALID bit breaks on P1022 platform, which not contains this bit. - P1023/P3041/P5020 etc, have this bit
- P3060/4080/PSC913x do have this bit, but not mentioned in RM.
- P1022(perhaps and other) has no this bit
I'm waiting for the response from FSL silicon team to confirm whether there is other platform not including this bit or not, so this patch maybe have to be pending until I get confirmation.

Thanks,
Shengzhou

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Best regards,
Marek Vasut

#5 lore raw

PATCH 1/1 powerpc/usb: fix bug of CPU halt when missing USB PHY clock

Hello guys,

I didn't get an explicit list from silicon team to point out which platforms contain this PHY_CLK_VALID bit or not, Someone said all platforms have this bit, it's not true, at least we found P4080 and P1022 no this bit. I'll trace it later.

This patch is not necessary for boards with USB PHY clock valid, just for those case of USB PHY clock invalid.

Thanks,
Shengzhou

Quoted 68 lines

-----Original Message-----
From: Marek Vasut [mailto:marex at denx.de]
Sent: Thursday, April 19, 2012 6:57 AM
To: Andy Fleming
Cc: Liu Shengzhou-B36685; u-boot at lists.denx.de
Subject: Re: [U-Boot] [PATCH] powerpc/usb: fix bug of CPU halt when missing USB PHY clock

Dear Andy Fleming,

Quoted 2 lines

Pinging you on this, again. Also, I've now moved the patch to Marek's queue, instead of mine.

Thanks! Did the FSL silicon team respond already?

Quoted 50 lines

On Sun, Feb 26, 2012 at 8:44 PM, Liu Shengzhou-B36685

Quoted 46 lines · <[email protected]> wrote:
Quoted 22 lines

-----Original Message-----
From: Marek Vasut [mailto:marex at denx.de]
Sent: Monday, February 27, 2012 7:13 AM
To: u-boot at lists.denx.de
Cc: Liu Shengzhou-B36685
Subject: Re: [U-Boot] [PATCH] powerpc/usb: fix bug of CPU halt when missing USB PHY clock

Quoted 4 lines

when missing USB PHY clock and issuing "usb start" at u-boot prompt, writing to or_portsc register will cause CPU halt. We should check USBGP[PHY_CLK_VALID] bit at the first time in ehci_hcd_init() to

avoid

Quoted 6 lines

CPU hang in this case.

Signed-off-by Shengzhou Liu <[email protected]>
---
 drivers/usb/host/ehci-fsl.c |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)
Quoted 6 lines

Hi,

what's the status of this patch/patchset?

Thanks
M

Currently we found that usb CTRL_PHY_CLK_VALID bit breaks on P1022 platform, which not contains this bit. - P1023/P3041/P5020 etc, have this bit
- P3060/4080/PSC913x do have this bit, but not mentioned in RM.
- P1022(perhaps and other) has no this bit I'm waiting for the
response from FSL silicon team to confirm whether there is other platform not including this bit or not, so this patch maybe have to be pending until I get confirmation.

Thanks,
Shengzhou

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Best regards,
Marek Vasut

#6 lore raw

PATCH 1/1 powerpc/usb: fix bug of CPU halt when missing USB PHY clock

Dear Liu Shengzhou-B36685,

Quoted 9 lines

Hello guys,

I didn't get an explicit list from silicon team to point out which platforms contain this PHY_CLK_VALID bit or not, Someone said all platforms have this bit, it's not true, at least we found P4080 and P1022 no this bit. I'll trace it later.

This patch is not necessary for boards with USB PHY clock valid, just for those case of USB PHY clock invalid.

Roger that, thanks a lot :)

Quoted 74 lines

Thanks,
Shengzhou

Quoted 70 lines

-----Original Message-----
From: Marek Vasut [mailto:marex at denx.de]
Sent: Thursday, April 19, 2012 6:57 AM
To: Andy Fleming
Cc: Liu Shengzhou-B36685; u-boot at lists.denx.de
Subject: Re: [U-Boot] [PATCH] powerpc/usb: fix bug of CPU halt when missing USB PHY clock

Dear Andy Fleming,

Quoted 2 lines

Pinging you on this, again. Also, I've now moved the patch to Marek's queue, instead of mine.

Thanks! Did the FSL silicon team respond already?

Quoted 52 lines

On Sun, Feb 26, 2012 at 8:44 PM, Liu Shengzhou-B36685

Quoted 49 lines · <[email protected]> wrote:
Quoted 23 lines

-----Original Message-----
From: Marek Vasut [mailto:marex at denx.de]
Sent: Monday, February 27, 2012 7:13 AM
To: u-boot at lists.denx.de
Cc: Liu Shengzhou-B36685
Subject: Re: [U-Boot] [PATCH] powerpc/usb: fix bug of CPU halt when missing USB PHY clock

Quoted 4 lines

when missing USB PHY clock and issuing "usb start" at u-boot prompt, writing to or_portsc register will cause CPU halt. We should check USBGP[PHY_CLK_VALID] bit at the first time in ehci_hcd_init() to

avoid

Quoted 7 lines

CPU hang in this case.

Signed-off-by Shengzhou Liu <[email protected]>

---

 drivers/usb/host/ehci-fsl.c |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)
Quoted 6 lines

Hi,

what's the status of this patch/patchset?

Thanks
M

Currently we found that usb CTRL_PHY_CLK_VALID bit breaks on P1022 platform, which not contains this bit. - P1023/P3041/P5020 etc, have this bit

- P3060/4080/PSC913x do have this bit, but not mentioned in RM.
- P1022(perhaps and other) has no this bit I'm waiting for the

response from FSL silicon team to confirm whether there is other platform not including this bit or not, so this patch maybe have to be pending until I get confirmation.

Thanks,
Shengzhou

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Best regards,
Marek Vasut

Best regards,
Marek Vasut

#7 lore raw

PATCH 1/1 powerpc/usb: fix bug of CPU halt when missing USB PHY clock

In reply to Liu Shengzhou-B36685

Dear Liu Shengzhou-B36685,

Quoted 7 lines

Hello guys,

I didn't get an explicit list from silicon team to point out which platforms contain this PHY_CLK_VALID bit or not, Someone said all platforms have this bit, it's not true, at least we found P4080 and P1022 no this bit. I'll trace it later.

Quoted 5 lines

This patch is not necessary for boards with USB PHY clock valid, just for those case of USB PHY clock invalid.

Thanks,
Shengzhou

[...]

So did anything new happen here or shall I just discard the patch?

Best regards,
Marek Vasut

#8 lore raw

PATCH 1/1 powerpc/usb: fix bug of CPU halt when missing USB PHY clock

Quoted 22 lines

-----Original Message-----
From: Marek Vasut [mailto:marex at denx.de]
Sent: Tuesday, October 16, 2012 2:23 PM
To: Liu Shengzhou-B36685
Cc: Andy Fleming; u-boot at lists.denx.de
Subject: Re: [U-Boot] [PATCH] powerpc/usb: fix bug of CPU halt when missing USB PHY clock

Dear Liu Shengzhou-B36685,

Quoted 10 lines

Hello guys,

I didn't get an explicit list from silicon team to point out which platforms contain this PHY_CLK_VALID bit or not, Someone said all platforms have this bit, it's not true, at least we found P4080 and P1022 no this bit. I'll trace it later.

This patch is not necessary for boards with USB PHY clock valid, just for those case of USB PHY clock invalid.

Quoted 8 lines
Quoted 2 lines

Thanks,
Shengzhou

[...]

So did anything new happen here or shall I just discard the patch?

Best regards,
Marek Vasut

Hello Marek,
I re-submitted a new version as below, please review it.
http://patchwork.ozlabs.org/patch/192178/

Thanks,
Shengzhou