| Message ID | 20190508060608.33882-4-yinbo.zhu@nxp.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v5,1/5] usb: fsl: Set USB_EN bit to select ULPI phy | expand |
On Wed, 8 May 2019, Yinbo Zhu wrote: > From: Ramneek Mehresh <ramneek.mehresh@freescale.com> > > 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 <ramneek.mehresh@freescale.com> > Signed-off-by: Suresh Gupta <suresh.gupta@freescale.com> > Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com> > --- > 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:stern@rowland.harvard.edu] > Sent: 2019年5月9日 0:50 > To: Yinbo Zhu <yinbo.zhu@nxp.com> > Cc: Xiaobo Xie <xiaobo.xie@nxp.com>; Greg Kroah-Hartman > <gregkh@linuxfoundation.org>; Ramneek Mehresh > <ramneek.mehresh@freescale.com>; Nikhil Badola > <nikhil.badola@freescale.com>; Ran Wang <ran.wang_1@nxp.com>; > linux-usb@vger.kernel.org; linux-kernel@vger.kernel.org; Jiafei Pan > <jiafei.pan@nxp.com>; Suresh Gupta <suresh.gupta@freescale.com> > 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 <ramneek.mehresh@freescale.com> > > > > 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 <ramneek.mehresh@freescale.com> > > Signed-off-by: Suresh Gupta <suresh.gupta@freescale.com> > > Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com> > > --- > > 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
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