* [PATCH v3 1/5] usb: fsl: Set USB_EN bit to select ULPI phy
@ 2019-01-23 7:05 Yinbo Zhu
2019-01-23 7:05 ` [PATCH v3 2/5] usb: phy: Workaround for USB erratum-A005728 Yinbo Zhu
` (4 more replies)
0 siblings, 5 replies; 10+ messages in thread
From: Yinbo Zhu @ 2019-01-23 7:05 UTC (permalink / raw)
To: Alan Stern
Cc: Yinbo Zhu, Xiaobo Xie, Jerry Huang, Ran Wang, Greg Kroah-Hartman,
Ramneek Mehresh, Nikhil Badola, Suresh Gupta, linux-usb,
linux-kernel
From: Nikhil Badola <nikhil.badola@freescale.com>
Set USB_EN bit to select ULPI phy for USB controller version 2.5
Signed-off-by: Nikhil Badola <nikhil.badola@freescale.com>
Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
---
Change in v3:
Code base already has patch[5/6], so remove it.
drivers/usb/host/ehci-fsl.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index e3d0c1c..ea7e17b 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -122,6 +122,12 @@ static int fsl_ehci_drv_probe(struct platform_device *pdev)
tmp |= 0x4;
iowrite32be(tmp, hcd->regs + FSL_SOC_USB_CTRL);
}
+
+ /* Set USB_EN bit to select ULPI phy for USB controller version 2.5 */
+ if (pdata->controller_ver == FSL_USB_VER_2_5 &&
+ pdata->phy_mode == FSL_USB2_PHY_ULPI)
+ iowrite32be(USB_CTRL_USB_EN, hcd->regs + FSL_SOC_USB_CTRL);
+
/*
* Enable UTMI phy and program PTS field in UTMI mode before asserting
* controller reset for USB Controller version 2.5
--
1.7.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v3 2/5] usb: phy: Workaround for USB erratum-A005728
2019-01-23 7:05 [PATCH v3 1/5] usb: fsl: Set USB_EN bit to select ULPI phy Yinbo Zhu
@ 2019-01-23 7:05 ` Yinbo Zhu
2019-01-23 19:10 ` Alan Stern
2019-01-23 7:05 ` [PATCH v3 3/5] usb: host: Stops USB controller init if PLL fails to lock Yinbo Zhu
` (3 subsequent siblings)
4 siblings, 1 reply; 10+ messages in thread
From: Yinbo Zhu @ 2019-01-23 7:05 UTC (permalink / raw)
To: Alan Stern
Cc: Yinbo Zhu, Xiaobo Xie, Jerry Huang, Ran Wang, Greg Kroah-Hartman,
Ramneek Mehresh, Nikhil Badola, Suresh Gupta, linux-usb,
linux-kernel, Suresh Gupta
From: Suresh Gupta <B42813@freescale.com>
PHY_CLK_VALID bit for UTMI PHY in USBDR does not set even
if PHY is providing valid clock. Workaround for this
involves resetting of PHY and check PHY_CLK_VALID bit
multiple times. If PHY_CLK_VALID bit is still not set even
after 5 retries, it would be safe to deaclare that PHY
clock is not available.
This erratum is applicable for USBDR less then ver 2.4.
Signed-off-by: Suresh Gupta <B42813@freescale.com>
Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
---
Change in v3:
replace in_be32 with ioread32be
drivers/usb/host/ehci-fsl.c | 37 ++++++++++++++++++++++++++-----------
drivers/usb/host/ehci-fsl.h | 3 +++
2 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index ea7e17b..8b0f3ed 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -183,6 +183,17 @@ static int fsl_ehci_drv_probe(struct platform_device *pdev)
return retval;
}
+static bool usb_phy_clk_valid(struct usb_hcd *hcd)
+{
+ void __iomem *non_ehci = hcd->regs;
+ bool ret = true;
+
+ if (!(ioread32be(non_ehci + FSL_SOC_USB_CTRL) & PHY_CLK_VALID))
+ ret = false;
+
+ return ret;
+}
+
static int ehci_fsl_setup_phy(struct usb_hcd *hcd,
enum fsl_usb2_phy_modes phy_mode,
unsigned int port_offset)
@@ -226,6 +237,16 @@ static int ehci_fsl_setup_phy(struct usb_hcd *hcd,
/* fall through */
case FSL_USB2_PHY_UTMI:
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
+ * internal UTMI phy
+ */
+ if (pdata->controller_ver > FSL_USB_VER_2_4 &&
+ pdata->have_sysif_regs && !usb_phy_clk_valid(hcd)) {
+ pr_err("fsl-ehci: USB PHY clock invalid\n");
+ return -EINVAL;
+ }
+
if (pdata->have_sysif_regs && pdata->controller_ver) {
/* controller version 1.6 or above */
tmp = ioread32be(non_ehci + FSL_SOC_USB_CTRL);
@@ -249,17 +270,11 @@ static int ehci_fsl_setup_phy(struct usb_hcd *hcd,
break;
}
- /*
- * check PHY_CLK_VALID to determine phy clock presence before writing
- * to portsc
- */
- if (pdata->check_phy_clk_valid) {
- if (!(ioread32be(non_ehci + FSL_SOC_USB_CTRL) &
- PHY_CLK_VALID)) {
- dev_warn(hcd->self.controller,
- "USB PHY clock invalid\n");
- return -EINVAL;
- }
+ if (pdata->have_sysif_regs &&
+ pdata->controller_ver > FSL_USB_VER_1_6 &&
+ !usb_phy_clk_valid(hcd)) {
+ dev_warn(hcd->self.controller, "USB PHY clock invalid\n");
+ return -EINVAL;
}
ehci_writel(ehci, portsc, &ehci->regs->port_status[port_offset]);
diff --git a/drivers/usb/host/ehci-fsl.h b/drivers/usb/host/ehci-fsl.h
index cbc4220..9d18c6e 100644
--- a/drivers/usb/host/ehci-fsl.h
+++ b/drivers/usb/host/ehci-fsl.h
@@ -50,4 +50,7 @@
#define UTMI_PHY_EN (1<<9)
#define ULPI_PHY_CLK_SEL (1<<10)
#define PHY_CLK_VALID (1<<17)
+
+/* Retry count for checking UTMI PHY CLK validity */
+#define UTMI_PHY_CLK_VALID_CHK_RETRY 5
#endif /* _EHCI_FSL_H */
--
1.7.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v3 3/5] usb: host: Stops USB controller init if PLL fails to lock
2019-01-23 7:05 [PATCH v3 1/5] usb: fsl: Set USB_EN bit to select ULPI phy Yinbo Zhu
2019-01-23 7:05 ` [PATCH v3 2/5] usb: phy: Workaround for USB erratum-A005728 Yinbo Zhu
@ 2019-01-23 7:05 ` Yinbo Zhu
2019-01-23 19:12 ` Alan Stern
2019-01-23 7:05 ` [PATCH v3 4/5] usb: linux/fsl_device: Add platform member has_fsl_erratum_a006918 Yinbo Zhu
` (2 subsequent siblings)
4 siblings, 1 reply; 10+ messages in thread
From: Yinbo Zhu @ 2019-01-23 7:05 UTC (permalink / raw)
To: Alan Stern
Cc: Yinbo Zhu, Xiaobo Xie, Jerry Huang, Ran Wang, Greg Kroah-Hartman,
Ramneek Mehresh, Nikhil Badola, Suresh Gupta, linux-usb,
linux-kernel
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>
---
drivers/usb/host/ehci-fsl.c | 5 +++++
drivers/usb/host/fsl-mph-dr-of.c | 4 ++++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index 8b0f3ed..e276067 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) {
+ pr_warn("fsl-ehci: 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..bdc8812 100644
--- a/drivers/usb/host/fsl-mph-dr-of.c
+++ b/drivers/usb/host/fsl-mph-dr-of.c
@@ -230,6 +230,10 @@ static int fsl_usb2_mph_dr_of_probe(struct platform_device *ofdev)
else
pdata->has_fsl_erratum_14 = 0;
+ if (of_get_property(np, "fsl,erratum_a006918", NULL))
+ pdata->has_fsl_erratum_a006918 = 1;
+ else
+ pdata->has_fsl_erratum_a006918 = 0;
/*
* Determine whether phy_clk_valid needs to be checked
--
1.7.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v3 4/5] usb: linux/fsl_device: Add platform member has_fsl_erratum_a006918
2019-01-23 7:05 [PATCH v3 1/5] usb: fsl: Set USB_EN bit to select ULPI phy Yinbo Zhu
2019-01-23 7:05 ` [PATCH v3 2/5] usb: phy: Workaround for USB erratum-A005728 Yinbo Zhu
2019-01-23 7:05 ` [PATCH v3 3/5] usb: host: Stops USB controller init if PLL fails to lock Yinbo Zhu
@ 2019-01-23 7:05 ` Yinbo Zhu
2019-01-23 19:15 ` Alan Stern
2019-01-23 7:05 ` [PATCH v3 5/5] usb :fsl: Change string format for errata property Yinbo Zhu
2019-01-23 19:11 ` [PATCH v3 1/5] usb: fsl: Set USB_EN bit to select ULPI phy Alan Stern
4 siblings, 1 reply; 10+ messages in thread
From: Yinbo Zhu @ 2019-01-23 7:05 UTC (permalink / raw)
To: Alan Stern
Cc: Yinbo Zhu, Xiaobo Xie, Jerry Huang, Ran Wang, Greg Kroah-Hartman,
Ramneek Mehresh, Nikhil Badola, Suresh Gupta, linux-usb,
linux-kernel
From: Yinbo Zhu <yinbo.zhu@nxp.com>
This patch is to add member has_fsl_erratum_a006918 in platform data
Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
---
include/linux/fsl_devices.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h
index 5da56a6..4c613da 100644
--- a/include/linux/fsl_devices.h
+++ b/include/linux/fsl_devices.h
@@ -102,6 +102,7 @@ struct fsl_usb2_platform_data {
unsigned has_fsl_erratum_14:1;
unsigned has_fsl_erratum_a005275:1;
unsigned has_fsl_erratum_a005697:1;
+ unsigned has_fsl_erratum_a006918:1;
unsigned check_phy_clk_valid:1;
/* register save area for suspend/resume */
--
1.7.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v3 5/5] usb :fsl: Change string format for errata property
2019-01-23 7:05 [PATCH v3 1/5] usb: fsl: Set USB_EN bit to select ULPI phy Yinbo Zhu
` (2 preceding siblings ...)
2019-01-23 7:05 ` [PATCH v3 4/5] usb: linux/fsl_device: Add platform member has_fsl_erratum_a006918 Yinbo Zhu
@ 2019-01-23 7:05 ` Yinbo Zhu
2019-01-23 19:17 ` Alan Stern
2019-01-23 19:11 ` [PATCH v3 1/5] usb: fsl: Set USB_EN bit to select ULPI phy Alan Stern
4 siblings, 1 reply; 10+ messages in thread
From: Yinbo Zhu @ 2019-01-23 7:05 UTC (permalink / raw)
To: Alan Stern
Cc: Yinbo Zhu, Xiaobo Xie, Jerry Huang, Ran Wang, Greg Kroah-Hartman,
Ramneek Mehresh, Nikhil Badola, Suresh Gupta, linux-usb,
linux-kernel
From: Nikhil Badola <nikhil.badola@freescale.com>
Remove USB errata checking code from driver. Applicability of erratum
is retrieved by reading corresponding property in device tree.
This property is written during device tree fixup.
Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com>
Signed-off-by: Nikhil Badola <nikhil.badola@freescale.com>
Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
---
drivers/usb/host/fsl-mph-dr-of.c | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/drivers/usb/host/fsl-mph-dr-of.c b/drivers/usb/host/fsl-mph-dr-of.c
index bdc8812..ae8f60f 100644
--- a/drivers/usb/host/fsl-mph-dr-of.c
+++ b/drivers/usb/host/fsl-mph-dr-of.c
@@ -224,16 +224,10 @@ 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");
-
- if (of_get_property(np, "fsl,usb_erratum_14", NULL))
- pdata->has_fsl_erratum_14 = 1;
- else
- pdata->has_fsl_erratum_14 = 0;
-
- if (of_get_property(np, "fsl,erratum_a006918", NULL))
- pdata->has_fsl_erratum_a006918 = 1;
- else
- pdata->has_fsl_erratum_a006918 = 0;
+ pdata->has_fsl_erratum_a006918 =
+ of_property_read_bool(np, "fsl,usb_erratum-a006918");
+ pdata->has_fsl_erratum_14 =
+ of_property_read_bool(np, "fsl,usb_erratum-14");
/*
* Determine whether phy_clk_valid needs to be checked
--
1.7.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v3 2/5] usb: phy: Workaround for USB erratum-A005728
2019-01-23 7:05 ` [PATCH v3 2/5] usb: phy: Workaround for USB erratum-A005728 Yinbo Zhu
@ 2019-01-23 19:10 ` Alan Stern
0 siblings, 0 replies; 10+ messages in thread
From: Alan Stern @ 2019-01-23 19:10 UTC (permalink / raw)
To: Yinbo Zhu
Cc: Xiaobo Xie, Jerry Huang, Ran Wang, Greg Kroah-Hartman,
Ramneek Mehresh, Nikhil Badola, Suresh Gupta, linux-usb,
linux-kernel, Suresh Gupta
On Wed, 23 Jan 2019, Yinbo Zhu wrote:
> From: Suresh Gupta <B42813@freescale.com>
>
> PHY_CLK_VALID bit for UTMI PHY in USBDR does not set even
> if PHY is providing valid clock. Workaround for this
> involves resetting of PHY and check PHY_CLK_VALID bit
> multiple times. If PHY_CLK_VALID bit is still not set even
> after 5 retries, it would be safe to deaclare that PHY
> clock is not available.
> This erratum is applicable for USBDR less then ver 2.4.
>
> Signed-off-by: Suresh Gupta <B42813@freescale.com>
> Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
> ---
> Change in v3:
> replace in_be32 with ioread32be
>
> drivers/usb/host/ehci-fsl.c | 37 ++++++++++++++++++++++++++-----------
> drivers/usb/host/ehci-fsl.h | 3 +++
> 2 files changed, 29 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
> index ea7e17b..8b0f3ed 100644
> --- a/drivers/usb/host/ehci-fsl.c
> +++ b/drivers/usb/host/ehci-fsl.c
> @@ -183,6 +183,17 @@ static int fsl_ehci_drv_probe(struct platform_device *pdev)
> return retval;
> }
>
> +static bool usb_phy_clk_valid(struct usb_hcd *hcd)
> +{
> + void __iomem *non_ehci = hcd->regs;
> + bool ret = true;
> +
> + if (!(ioread32be(non_ehci + FSL_SOC_USB_CTRL) & PHY_CLK_VALID))
> + ret = false;
> +
> + return ret;
> +}
> +
> static int ehci_fsl_setup_phy(struct usb_hcd *hcd,
> enum fsl_usb2_phy_modes phy_mode,
> unsigned int port_offset)
> @@ -226,6 +237,16 @@ static int ehci_fsl_setup_phy(struct usb_hcd *hcd,
> /* fall through */
> case FSL_USB2_PHY_UTMI:
> 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
> + * internal UTMI phy
> + */
> + if (pdata->controller_ver > FSL_USB_VER_2_4 &&
> + pdata->have_sysif_regs && !usb_phy_clk_valid(hcd)) {
> + pr_err("fsl-ehci: USB PHY clock invalid\n");
How about using dev_err instead of pr_err? That's what other parts of
this driver do.
> + return -EINVAL;
> + }
> +
> if (pdata->have_sysif_regs && pdata->controller_ver) {
> /* controller version 1.6 or above */
> tmp = ioread32be(non_ehci + FSL_SOC_USB_CTRL);
> @@ -249,17 +270,11 @@ static int ehci_fsl_setup_phy(struct usb_hcd *hcd,
> break;
> }
>
> - /*
> - * check PHY_CLK_VALID to determine phy clock presence before writing
> - * to portsc
> - */
> - if (pdata->check_phy_clk_valid) {
> - if (!(ioread32be(non_ehci + FSL_SOC_USB_CTRL) &
> - PHY_CLK_VALID)) {
> - dev_warn(hcd->self.controller,
> - "USB PHY clock invalid\n");
> - return -EINVAL;
> - }
> + if (pdata->have_sysif_regs &&
> + pdata->controller_ver > FSL_USB_VER_1_6 &&
> + !usb_phy_clk_valid(hcd)) {
Continuation lines should be indented by an amount that lets readers
easily distinguish them from lines in an inner code block. (Also
applies to hunk #2.)
> + dev_warn(hcd->self.controller, "USB PHY clock invalid\n");
> + return -EINVAL;
> }
>
> ehci_writel(ehci, portsc, &ehci->regs->port_status[port_offset]);
> diff --git a/drivers/usb/host/ehci-fsl.h b/drivers/usb/host/ehci-fsl.h
> index cbc4220..9d18c6e 100644
> --- a/drivers/usb/host/ehci-fsl.h
> +++ b/drivers/usb/host/ehci-fsl.h
> @@ -50,4 +50,7 @@
> #define UTMI_PHY_EN (1<<9)
> #define ULPI_PHY_CLK_SEL (1<<10)
> #define PHY_CLK_VALID (1<<17)
> +
> +/* Retry count for checking UTMI PHY CLK validity */
> +#define UTMI_PHY_CLK_VALID_CHK_RETRY 5
> #endif /* _EHCI_FSL_H */
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v3 1/5] usb: fsl: Set USB_EN bit to select ULPI phy
2019-01-23 7:05 [PATCH v3 1/5] usb: fsl: Set USB_EN bit to select ULPI phy Yinbo Zhu
` (3 preceding siblings ...)
2019-01-23 7:05 ` [PATCH v3 5/5] usb :fsl: Change string format for errata property Yinbo Zhu
@ 2019-01-23 19:11 ` Alan Stern
4 siblings, 0 replies; 10+ messages in thread
From: Alan Stern @ 2019-01-23 19:11 UTC (permalink / raw)
To: Yinbo Zhu
Cc: Xiaobo Xie, Jerry Huang, Ran Wang, Greg Kroah-Hartman,
Ramneek Mehresh, Nikhil Badola, Suresh Gupta, linux-usb,
linux-kernel
On Wed, 23 Jan 2019, Yinbo Zhu wrote:
> From: Nikhil Badola <nikhil.badola@freescale.com>
>
> Set USB_EN bit to select ULPI phy for USB controller version 2.5
>
> Signed-off-by: Nikhil Badola <nikhil.badola@freescale.com>
> Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
> ---
> Change in v3:
> Code base already has patch[5/6], so remove it.
>
> drivers/usb/host/ehci-fsl.c | 6 ++++++
> 1 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
> index e3d0c1c..ea7e17b 100644
> --- a/drivers/usb/host/ehci-fsl.c
> +++ b/drivers/usb/host/ehci-fsl.c
> @@ -122,6 +122,12 @@ static int fsl_ehci_drv_probe(struct platform_device *pdev)
> tmp |= 0x4;
> iowrite32be(tmp, hcd->regs + FSL_SOC_USB_CTRL);
> }
> +
> + /* Set USB_EN bit to select ULPI phy for USB controller version 2.5 */
> + if (pdata->controller_ver == FSL_USB_VER_2_5 &&
> + pdata->phy_mode == FSL_USB2_PHY_ULPI)
Incorrect indentation of the continuation line.
Alan Stern
> + iowrite32be(USB_CTRL_USB_EN, hcd->regs + FSL_SOC_USB_CTRL);
> +
> /*
> * Enable UTMI phy and program PTS field in UTMI mode before asserting
> * controller reset for USB Controller version 2.5
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v3 3/5] usb: host: Stops USB controller init if PLL fails to lock
2019-01-23 7:05 ` [PATCH v3 3/5] usb: host: Stops USB controller init if PLL fails to lock Yinbo Zhu
@ 2019-01-23 19:12 ` Alan Stern
0 siblings, 0 replies; 10+ messages in thread
From: Alan Stern @ 2019-01-23 19:12 UTC (permalink / raw)
To: Yinbo Zhu
Cc: Xiaobo Xie, Jerry Huang, Ran Wang, Greg Kroah-Hartman,
Ramneek Mehresh, Nikhil Badola, Suresh Gupta, linux-usb,
linux-kernel
On Wed, 23 Jan 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>
> ---
> drivers/usb/host/ehci-fsl.c | 5 +++++
> drivers/usb/host/fsl-mph-dr-of.c | 4 ++++
> 2 files changed, 9 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
> index 8b0f3ed..e276067 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) {
> + pr_warn("fsl-ehci: USB PHY clock invalid\n");
As before, use dev_warn.
Alan Stern
> + 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..bdc8812 100644
> --- a/drivers/usb/host/fsl-mph-dr-of.c
> +++ b/drivers/usb/host/fsl-mph-dr-of.c
> @@ -230,6 +230,10 @@ static int fsl_usb2_mph_dr_of_probe(struct platform_device *ofdev)
> else
> pdata->has_fsl_erratum_14 = 0;
>
> + if (of_get_property(np, "fsl,erratum_a006918", NULL))
> + pdata->has_fsl_erratum_a006918 = 1;
> + else
> + pdata->has_fsl_erratum_a006918 = 0;
>
> /*
> * Determine whether phy_clk_valid needs to be checked
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v3 4/5] usb: linux/fsl_device: Add platform member has_fsl_erratum_a006918
2019-01-23 7:05 ` [PATCH v3 4/5] usb: linux/fsl_device: Add platform member has_fsl_erratum_a006918 Yinbo Zhu
@ 2019-01-23 19:15 ` Alan Stern
0 siblings, 0 replies; 10+ messages in thread
From: Alan Stern @ 2019-01-23 19:15 UTC (permalink / raw)
To: Yinbo Zhu
Cc: Xiaobo Xie, Jerry Huang, Ran Wang, Greg Kroah-Hartman,
Ramneek Mehresh, Nikhil Badola, Suresh Gupta, linux-usb,
linux-kernel
On Wed, 23 Jan 2019, Yinbo Zhu wrote:
> From: Yinbo Zhu <yinbo.zhu@nxp.com>
>
> This patch is to add member has_fsl_erratum_a006918 in platform data
This should come before patch 3/5. Otherwise that patch will get a
compile error when it tries to reference the has_fsl_erratum_a006918
field and the field hasn't been created yet.
Alan Stern
>
> Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
> ---
> include/linux/fsl_devices.h | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h
> index 5da56a6..4c613da 100644
> --- a/include/linux/fsl_devices.h
> +++ b/include/linux/fsl_devices.h
> @@ -102,6 +102,7 @@ struct fsl_usb2_platform_data {
> unsigned has_fsl_erratum_14:1;
> unsigned has_fsl_erratum_a005275:1;
> unsigned has_fsl_erratum_a005697:1;
> + unsigned has_fsl_erratum_a006918:1;
> unsigned check_phy_clk_valid:1;
>
> /* register save area for suspend/resume */
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v3 5/5] usb :fsl: Change string format for errata property
2019-01-23 7:05 ` [PATCH v3 5/5] usb :fsl: Change string format for errata property Yinbo Zhu
@ 2019-01-23 19:17 ` Alan Stern
0 siblings, 0 replies; 10+ messages in thread
From: Alan Stern @ 2019-01-23 19:17 UTC (permalink / raw)
To: Yinbo Zhu
Cc: Xiaobo Xie, Jerry Huang, Ran Wang, Greg Kroah-Hartman,
Ramneek Mehresh, Nikhil Badola, Suresh Gupta, linux-usb,
linux-kernel
On Wed, 23 Jan 2019, Yinbo Zhu wrote:
> From: Nikhil Badola <nikhil.badola@freescale.com>
>
> Remove USB errata checking code from driver. Applicability of erratum
> is retrieved by reading corresponding property in device tree.
> This property is written during device tree fixup.
>
> Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com>
> Signed-off-by: Nikhil Badola <nikhil.badola@freescale.com>
> Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
> ---
> drivers/usb/host/fsl-mph-dr-of.c | 14 ++++----------
> 1 files changed, 4 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/usb/host/fsl-mph-dr-of.c b/drivers/usb/host/fsl-mph-dr-of.c
> index bdc8812..ae8f60f 100644
> --- a/drivers/usb/host/fsl-mph-dr-of.c
> +++ b/drivers/usb/host/fsl-mph-dr-of.c
> @@ -224,16 +224,10 @@ 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");
> -
> - if (of_get_property(np, "fsl,usb_erratum_14", NULL))
> - pdata->has_fsl_erratum_14 = 1;
> - else
> - pdata->has_fsl_erratum_14 = 0;
> -
> - if (of_get_property(np, "fsl,erratum_a006918", NULL))
> - pdata->has_fsl_erratum_a006918 = 1;
> - else
> - pdata->has_fsl_erratum_a006918 = 0;
> + pdata->has_fsl_erratum_a006918 =
> + of_property_read_bool(np, "fsl,usb_erratum-a006918");
> + pdata->has_fsl_erratum_14 =
> + of_property_read_bool(np, "fsl,usb_erratum-14");
Why go to the trouble of adding bad code for has_fsl_erratum_a006918 in
patch 4/5 if you're going to change that code here? Why not just add
the correct code in the first place?
Alan Stern
>
> /*
> * Determine whether phy_clk_valid needs to be checked
>
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2019-01-23 19:17 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-23 7:05 [PATCH v3 1/5] usb: fsl: Set USB_EN bit to select ULPI phy Yinbo Zhu
2019-01-23 7:05 ` [PATCH v3 2/5] usb: phy: Workaround for USB erratum-A005728 Yinbo Zhu
2019-01-23 19:10 ` Alan Stern
2019-01-23 7:05 ` [PATCH v3 3/5] usb: host: Stops USB controller init if PLL fails to lock Yinbo Zhu
2019-01-23 19:12 ` Alan Stern
2019-01-23 7:05 ` [PATCH v3 4/5] usb: linux/fsl_device: Add platform member has_fsl_erratum_a006918 Yinbo Zhu
2019-01-23 19:15 ` Alan Stern
2019-01-23 7:05 ` [PATCH v3 5/5] usb :fsl: Change string format for errata property Yinbo Zhu
2019-01-23 19:17 ` Alan Stern
2019-01-23 19:11 ` [PATCH v3 1/5] usb: fsl: Set USB_EN bit to select ULPI phy Alan Stern
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).