From: Ramneek Mehresh <[email protected]>
USB erratum-A006918 workaround tries to start internal PHY inside
uboot (when PLL fails to lock). However, if the workaround also
fails, then USB initialization is also stopped inside Linux.
Erratum-A006918 workaround failure creates "fsl,erratum_a006918"
node in device-tree. Presence of this node in device-tree is
used to stop USB controller initialization in Linux
Signed-off-by: Ramneek Mehresh <[email protected]>
Signed-off-by: Suresh Gupta <[email protected]>
Signed-off-by: Yinbo Zhu <[email protected]>
---
Change in v5:
use dev_warn() instead of pr_warn()
drivers/usb/host/ehci-fsl.c | 5 +++++
drivers/usb/host/fsl-mph-dr-of.c | 3 ++-
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index 1634ac8..90550a6 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -236,6 +236,11 @@ static int ehci_fsl_setup_phy(struct usb_hcd *hcd,
portsc |= PORT_PTS_PTW;
/* fall through */
case FSL_USB2_PHY_UTMI:
+ if (pdata->has_fsl_erratum_a006918) {
+ dev_warn(dev, "USB PHY clock invalid\n");
+ return -EINVAL;
+ }
+
case FSL_USB2_PHY_UTMI_DUAL:
/* PHY_CLK_VALID bit is de-featured from all controller
* versions below 2.4 and is to be checked only for
diff --git a/drivers/usb/host/fsl-mph-dr-of.c b/drivers/usb/host/fsl-mph-dr-of.c
index 4f8b8a0..762b976 100644
--- a/drivers/usb/host/fsl-mph-dr-of.c
+++ b/drivers/usb/host/fsl-mph-dr-of.c
@@ -224,13 +224,14 @@ static int fsl_usb2_mph_dr_of_probe(struct platform_device *ofdev)
of_property_read_bool(np, "fsl,usb-erratum-a005275");
pdata->has_fsl_erratum_a005697 =
of_property_read_bool(np, "fsl,usb_erratum-a005697");
+ pdata->has_fsl_erratum_a006918 =
+ of_property_read_bool(np, "fsl,usb_erratum-a006918");
if (of_get_property(np, "fsl,usb_erratum_14", NULL))
pdata->has_fsl_erratum_14 = 1;
else
pdata->has_fsl_erratum_14 = 0;
-
/*
* Determine whether phy_clk_valid needs to be checked
* by reading property in device tree
--
1.7.1
On Wed, 8 May 2019, Yinbo Zhu wrote:
> From: Ramneek Mehresh <[email protected]>
>
> USB erratum-A006918 workaround tries to start internal PHY inside
> uboot (when PLL fails to lock). However, if the workaround also
> fails, then USB initialization is also stopped inside Linux.
> Erratum-A006918 workaround failure creates "fsl,erratum_a006918"
> node in device-tree. Presence of this node in device-tree is
> used to stop USB controller initialization in Linux
>
> Signed-off-by: Ramneek Mehresh <[email protected]>
> Signed-off-by: Suresh Gupta <[email protected]>
> Signed-off-by: Yinbo Zhu <[email protected]>
> ---
> Change in v5:
> use dev_warn() instead of pr_warn()
>
> drivers/usb/host/ehci-fsl.c | 5 +++++
> drivers/usb/host/fsl-mph-dr-of.c | 3 ++-
> 2 files changed, 7 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
> index 1634ac8..90550a6 100644
> --- a/drivers/usb/host/ehci-fsl.c
> +++ b/drivers/usb/host/ehci-fsl.c
> @@ -236,6 +236,11 @@ static int ehci_fsl_setup_phy(struct usb_hcd *hcd,
> portsc |= PORT_PTS_PTW;
> /* fall through */
> case FSL_USB2_PHY_UTMI:
> + if (pdata->has_fsl_erratum_a006918) {
> + dev_warn(dev, "USB PHY clock invalid\n");
> + return -EINVAL;
> + }
> +
You need to add a "Fall through" comment between these two cases.
> case FSL_USB2_PHY_UTMI_DUAL:
> /* PHY_CLK_VALID bit is de-featured from all controller
> * versions below 2.4 and is to be checked only for
Alan Stern
> -----Original Message-----
> From: Alan Stern [mailto:[email protected]]
> Sent: 2019??5??9?? 0:50
> To: Yinbo Zhu <[email protected]>
> Cc: Xiaobo Xie <[email protected]>; Greg Kroah-Hartman
> <[email protected]>; Ramneek Mehresh
> <[email protected]>; Nikhil Badola
> <[email protected]>; Ran Wang <[email protected]>;
> [email protected]; [email protected]; Jiafei Pan
> <[email protected]>; Suresh Gupta <[email protected]>
> Subject: [EXT] Re: [PATCH v5 4/5] usb: host: Stops USB controller init if PLL fails to
> lock
>
> Caution: EXT Email
>
> On Wed, 8 May 2019, Yinbo Zhu wrote:
>
> > From: Ramneek Mehresh <[email protected]>
> >
> > USB erratum-A006918 workaround tries to start internal PHY inside
> > uboot (when PLL fails to lock). However, if the workaround also fails,
> > then USB initialization is also stopped inside Linux.
> > Erratum-A006918 workaround failure creates "fsl,erratum_a006918"
> > node in device-tree. Presence of this node in device-tree is used to
> > stop USB controller initialization in Linux
> >
> > Signed-off-by: Ramneek Mehresh <[email protected]>
> > Signed-off-by: Suresh Gupta <[email protected]>
> > Signed-off-by: Yinbo Zhu <[email protected]>
> > ---
> > Change in v5:
> > use dev_warn() instead of pr_warn()
> >
> > drivers/usb/host/ehci-fsl.c | 5 +++++
> > drivers/usb/host/fsl-mph-dr-of.c | 3 ++-
> > 2 files changed, 7 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
> > index 1634ac8..90550a6 100644
> > --- a/drivers/usb/host/ehci-fsl.c
> > +++ b/drivers/usb/host/ehci-fsl.c
> > @@ -236,6 +236,11 @@ static int ehci_fsl_setup_phy(struct usb_hcd *hcd,
> > portsc |= PORT_PTS_PTW;
> > /* fall through */
> > case FSL_USB2_PHY_UTMI:
> > + if (pdata->has_fsl_erratum_a006918) {
> > + dev_warn(dev, "USB PHY clock invalid\n");
> > + return -EINVAL;
> > + }
> > +
>
> You need to add a "Fall through" comment between these two cases.
> > case FSL_USB2_PHY_UTMI_DUAL:
> > /* PHY_CLK_VALID bit is de-featured from all controller
> > * versions below 2.4 and is to be checked only for
>
> Alan Stern
Hi Alan Stern,
Your meaning is to remove "/* fall through*/" or add the erratum commont replace "/* fall through*/"
Regards,
Yinbo