powerpc/usb: fix bug of CPU hang when missing USB PHY clock
Subsystems (2)
PATCH v3 1/1 powerpc/usb: fix bug of CPU hang when missing USB PHY clock
when missing USB PHY clock, u-boot will hang during USB initialization when issuing "usb start". We should check USBGP[PHY_CLK_VALID] bit to avoid CPU hanging in this case.
Due to controller issue of PHY_CLK_VALID in ULPI mode, we set USB_EN before checking PHY_CLK_VALID, otherwise PHY_CLK_VALID doesn't work.
---
against master branch of upstream u-boot tree
v3: added explanation for set USB_EN earlier for ULPI case.
v2: integrated Marek's comment to use single negation.
drivers/usb/host/ehci-fsl.c | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-)
drivers/usb/host/ehci-fsl.c +16 -6
@@ -30,6 +30,18 @@#include "ehci.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 ("USB PHY clock invalid!\n" ); +return 0 ; + }else { +return 1 ; + } +} +/* * Create the appropriate control structures to manage * a new EHCI host controller.
@@ -82,18 +94,16 @@ int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)udelay (1000 );/* delay required for PHY Clk to appear */ #endif out_le32 (&(*hcor)->or_portsc[0 ],PORT_PTS_UTMI ); +setbits_be32 (&ehci->control,USB_EN ); }else { -#if defined(CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY ) -clrbits_be32 (&ehci->control,UTMI_PHY_EN );setbits_be32 (&ehci->control,PHY_CLK_SEL_ULPI ); +clrsetbits_be32 (&ehci->control,UTMI_PHY_EN ,USB_EN );udelay (1000 );/* delay required for PHY Clk to appear */ -#endif +if (!usb_phy_clk_valid (ehci)) +return -EINVAL ;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
Marek Vasut
AppliedPATCH v3 1/1 powerpc/usb: fix bug of CPU hang when missing USB PHY clock
Dear Shengzhou Liu,
Quoted 10 lines
when missing USB PHY clock, u-boot will hang during USB initialization when issuing "usb start". We should check USBGP[PHY_CLK_VALID] bit to avoid CPU hanging in this case.
Due to controller issue of
PHY_CLK_VALIDin ULPI mode, we setUSB_ENbefore checkingPHY_CLK_VALID, otherwisePHY_CLK_VALIDdoesn't work.Signed-off-by Shengzhou Liu <[email protected]>Acked-by Marek Vasut <[email protected]>
[...]
Applied, thanks
Best regards,
Marek Vasut