[PATCH v2 0/4] USB host support for TQMa8MPxL + MBa8MPxL

[PATCH v2 0/4] USB host support for TQMa8MPxL + MBa8MPxL

[Alexander Stein]

Hi everybody,

this is the next version of this series for USB host support on TQMa8MPxL +
MBa8MPxL. Thanks everybody for their feedback on v1.

The DT configuration itself (patch 4) is rather straight forward, but leads to
the following dmesg errors regarding superspeed ports:
> [    8.549243] hub 2-1:1.0: hub_ext_port_status failed (err = -110)
> [   22.885263] usb 2-1: Failed to suspend device, error -110

This hardware works fine using the downstream kernel, because for imx8mp this
ITP sync feature is enabled conditionally [1] & [2].
Hacking this into mainline resulted in a working superspeed setup as well. I
also noticed that on some android kernel [3] depending in IP core version either
GCTL.SOFTITPSYNC or GFLADJ.GFLADJ_REFCLK_LPM_SEL is enabled unconditionally.
So I opted for the latter one using some quirk (patch 1-3).

Changes in v3:
* Added Krzysztof's A-b to Patch 1
* Added Li Jun's R-b to Patch 2
* Remove 'snps,dis-u2-freeclk-exists-quirk' in Patch 3
  snps,gfladj-refclk-lpm-sel-quirk is a superset of the old one
* Removed 'snps,dis_u3_susphy_quirk' in Patch 4
  This is addressed by patch series [4] & [5] separately

Thanks and best regards,
Alexander

[1] https://source.codeaurora.org/external/imx/linux-imx/tree/drivers/usb/dwc3/dwc3-imx8mp.c?h=lf-5.10.y#n134
[2] https://source.codeaurora.org/external/imx/linux-imx/tree/drivers/usb/dwc3/core.c?h=lf-5.10.y#n333
[3] https://android.googlesource.com/kernel/msm/+/87a6b154766907020cc74c7726e8a68aaa9d7f6b%5E%21/#F0
[4] https://lore.kernel.org/all/1662547028-22279-1-git-send-email-jun.li@nxp.com/
[5] https://lore.kernel.org/all/1663067426-29534-1-git-send-email-jun.li@nxp.com/

Alexander Stein (4):
  dt-bindings: usb: dwc3: Add gfladj-refclk-lpm-sel-quirk
  usb: dwc3: core: add gfladj_refclk_lpm_sel quirk
  arm64: dts: imx8mp: Add snps,gfladj-refclk-lpm-sel quirk to USB nodes
  arm64: dts: tqma8mpql: add support for 2nd USB (host) interface

Alexander Stein (4):
  dt-bindings: usb: dwc3: Add gfladj-refclk-lpm-sel-quirk
  usb: dwc3: core: add gfladj_refclk_lpm_sel quirk
  arm64: dts: imx8mp: Add snps,gfladj-refclk-lpm-sel quirk to USB nodes
  arm64: dts: tqma8mpql: add support for 2nd USB (host) interface

 .../devicetree/bindings/usb/snps,dwc3.yaml    |  5 +++
 .../freescale/imx8mp-tqma8mpql-mba8mpxl.dts   | 41 +++++++++++++++++++
 arch/arm64/boot/dts/freescale/imx8mp.dtsi     |  4 +-
 drivers/usb/dwc3/core.c                       |  8 +++-
 drivers/usb/dwc3/core.h                       |  2 +
 5 files changed, 57 insertions(+), 3 deletions(-)

-- 
2.25.1

[PATCH v2 1/4] dt-bindings: usb: dwc3: Add gfladj-refclk-lpm-sel-quirk

[Alexander Stein]

This selects SOF/ITP to be running on ref_clk.

Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 Documentation/devicetree/bindings/usb/snps,dwc3.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Documentation/devicetree/bindings/usb/snps,dwc3.yaml b/Documentation/devicetree/bindings/usb/snps,dwc3.yaml
index 1779d08ba1c0..2a54d0bb0b15 100644
--- a/Documentation/devicetree/bindings/usb/snps,dwc3.yaml
+++ b/Documentation/devicetree/bindings/usb/snps,dwc3.yaml
@@ -234,6 +234,11 @@ properties:
       avoid -EPROTO errors with usbhid on some devices (Hikey 970).
     type: boolean
 
+  snps,gfladj-refclk-lpm-sel-quirk:
+    description:
+      When set, run the SOF/ITP counter based on ref_clk.
+    type: boolean
+
   snps,is-utmi-l1-suspend:
     description:
       True when DWC3 asserts output signal utmi_l1_suspend_n, false when
-- 
2.25.1

[PATCH v2 2/4] usb: dwc3: core: add gfladj_refclk_lpm_sel quirk

[Alexander Stein]

This selects the SOF/ITP counter be running on ref_clk. As documented
U2_FREECLK_EXISTS has to be set to 0 as well.

Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Reviewed-by: Li Jun <jun.li@nxp.com>
---
 drivers/usb/dwc3/core.c | 8 +++++++-
 drivers/usb/dwc3/core.h | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 656bbf9285a5..885acc63f032 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -408,6 +408,10 @@ static void dwc3_ref_clk_period(struct dwc3 *dwc)
 	reg |= FIELD_PREP(DWC3_GFLADJ_REFCLK_FLADJ_MASK, fladj)
 	    |  FIELD_PREP(DWC3_GFLADJ_240MHZDECR, decr >> 1)
 	    |  FIELD_PREP(DWC3_GFLADJ_240MHZDECR_PLS1, decr & 1);
+
+	if (dwc->gfladj_refclk_lpm_sel)
+		reg |=  DWC3_GFLADJ_REFCLK_LPM_SEL;
+
 	dwc3_writel(dwc->regs, DWC3_GFLADJ, reg);
 }
 
@@ -789,7 +793,7 @@ static int dwc3_phy_setup(struct dwc3 *dwc)
 	else
 		reg |= DWC3_GUSB2PHYCFG_ENBLSLPM;
 
-	if (dwc->dis_u2_freeclk_exists_quirk)
+	if (dwc->dis_u2_freeclk_exists_quirk || dwc->gfladj_refclk_lpm_sel)
 		reg &= ~DWC3_GUSB2PHYCFG_U2_FREECLK_EXISTS;
 
 	dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg);
@@ -1525,6 +1529,8 @@ static void dwc3_get_properties(struct dwc3 *dwc)
 				"snps,dis-tx-ipgap-linecheck-quirk");
 	dwc->parkmode_disable_ss_quirk = device_property_read_bool(dev,
 				"snps,parkmode-disable-ss-quirk");
+	dwc->gfladj_refclk_lpm_sel = device_property_read_bool(dev,
+				"snps,gfladj-refclk-lpm-sel-quirk");
 
 	dwc->tx_de_emphasis_quirk = device_property_read_bool(dev,
 				"snps,tx_de_emphasis_quirk");
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index 7c9368145f37..d28c942e63dd 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -391,6 +391,7 @@
 #define DWC3_GFLADJ_30MHZ_SDBND_SEL		BIT(7)
 #define DWC3_GFLADJ_30MHZ_MASK			0x3f
 #define DWC3_GFLADJ_REFCLK_FLADJ_MASK		GENMASK(21, 8)
+#define DWC3_GFLADJ_REFCLK_LPM_SEL		BIT(23)
 #define DWC3_GFLADJ_240MHZDECR			GENMASK(30, 24)
 #define DWC3_GFLADJ_240MHZDECR_PLS1		BIT(31)
 
@@ -1312,6 +1313,7 @@ struct dwc3 {
 	unsigned		dis_del_phy_power_chg_quirk:1;
 	unsigned		dis_tx_ipgap_linecheck_quirk:1;
 	unsigned		parkmode_disable_ss_quirk:1;
+	unsigned		gfladj_refclk_lpm_sel:1;
 
 	unsigned		tx_de_emphasis_quirk:1;
 	unsigned		tx_de_emphasis:2;
-- 
2.25.1

[PATCH v2 3/4] arm64: dts: imx8mp: Add snps,gfladj-refclk-lpm-sel quirk to USB nodes

[Alexander Stein]

With this set the SOF/ITP counter is based on ref_clk when 2.0 ports are
suspended.
snps,dis-u2-freeclk-exists-quirk can be removed as
snps,gfladj-refclk-lpm-sel also clears the free running clock configuration
bit.

Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
---
 arch/arm64/boot/dts/freescale/imx8mp.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
index 504fd5f05395..d944ecca1b3c 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
@@ -1299,7 +1299,7 @@ usb_dwc3_0: usb@38100000 {
 				interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
 				phys = <&usb3_phy0>, <&usb3_phy0>;
 				phy-names = "usb2-phy", "usb3-phy";
-				snps,dis-u2-freeclk-exists-quirk;
+				snps,gfladj-refclk-lpm-sel-quirk;
 			};
 
 		};
@@ -1341,7 +1341,7 @@ usb_dwc3_1: usb@38200000 {
 				interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
 				phys = <&usb3_phy1>, <&usb3_phy1>;
 				phy-names = "usb2-phy", "usb3-phy";
-				snps,dis-u2-freeclk-exists-quirk;
+				snps,gfladj-refclk-lpm-sel-quirk;
 			};
 		};
 
-- 
2.25.1

[PATCH v2 4/4] arm64: dts: tqma8mpql: add support for 2nd USB (host) interface

[Alexander Stein]

The on-board USB hub has a single reset line which needs to be enabled.

Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
---
 .../freescale/imx8mp-tqma8mpql-mba8mpxl.dts   | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts b/arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts
index 7bf6f81e87b4..1c440909f580 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts
@@ -461,11 +461,23 @@ &usb3_0 {
 	status = "okay";
 };
 
+&usb3_1 {
+	fsl,disable-port-power-control;
+	fsl,permanently-attached;
+	dr_mode = "host";
+	status = "okay";
+};
+
 &usb3_phy0 {
 	vbus-supply = <&reg_vcc_5v0>;
 	status = "okay";
 };
 
+&usb3_phy1 {
+	vbus-supply = <&reg_vcc_5v0>;
+	status = "okay";
+};
+
 &usb_dwc3_0 {
 	/* dual role is implemented, but not a full featured OTG */
 	hnp-disable;
@@ -486,6 +498,31 @@ connector {
 	};
 };
 
+&usb_dwc3_1 {
+	dr_mode = "host";
+	#address-cells = <1>;
+	#size-cells = <0>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usbhub>;
+	status = "okay";
+
+	hub_2_0: hub@1 {
+		compatible = "usb451,8142";
+		reg = <1>;
+		peer-hub = <&hub_3_0>;
+		reset-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+		vdd-supply = <&reg_vcc_3v3>;
+	};
+
+	hub_3_0: hub@2 {
+		compatible = "usb451,8140";
+		reg = <2>;
+		peer-hub = <&hub_2_0>;
+		reset-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+		vdd-supply = <&reg_vcc_3v3>;
+	};
+};
+
 &usdhc2 {
 	pinctrl-names = "default", "state_100mhz", "state_200mhz";
 	pinctrl-0 = <&pinctrl_usdhc2>, <&pinctrl_usdhc2_gpio>;
@@ -720,6 +757,10 @@ pinctrl_usbcon0: usb0congrp {
 		fsl,pins = <MX8MP_IOMUXC_GPIO1_IO10__GPIO1_IO10		0x1c0>;
 	};
 
+	pinctrl_usbhub: usbhubgrp {
+		fsl,pins = <MX8MP_IOMUXC_GPIO1_IO11__GPIO1_IO11		0x10>;
+	};
+
 	pinctrl_usdhc2: usdhc2grp {
 		fsl,pins = <MX8MP_IOMUXC_SD2_CLK__USDHC2_CLK		0x192>,
 			   <MX8MP_IOMUXC_SD2_CMD__USDHC2_CMD		0x1d2>,
-- 
2.25.1

Re: [PATCH v2 4/4] arm64: dts: tqma8mpql: add support for 2nd USB (host) interface

[Greg Kroah-Hartman]

On Thu, Sep 15, 2022 at 08:28:55AM +0200, Alexander Stein wrote:
> The on-board USB hub has a single reset line which needs to be enabled.
> 
> Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
> ---
>  .../freescale/imx8mp-tqma8mpql-mba8mpxl.dts   | 41 +++++++++++++++++++
>  1 file changed, 41 insertions(+)

This patch failed to apply, please rebase and resend.

thanks,

greg k-h

Re: Re: [PATCH v2 4/4] arm64: dts: tqma8mpql: add support for 2nd USB (host) interface

[Alexander Stein]

Hi Greg,

Am Donnerstag, 22. September 2022, 15:17:06 CEST schrieb Greg Kroah-Hartman:
> On Thu, Sep 15, 2022 at 08:28:55AM +0200, Alexander Stein wrote:
> > The on-board USB hub has a single reset line which needs to be enabled.
> > 
> > Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
> > ---
> > 
> >  .../freescale/imx8mp-tqma8mpql-mba8mpxl.dts   | 41 +++++++++++++++++++
> >  1 file changed, 41 insertions(+)
> 
> This patch failed to apply, please rebase and resend.

If I rebase this one to usb-testing (or usb-next) this will conflict with 
additional patches for this file already in linux-next later on, especially 
fb4f0b69565e ("arm64: dts: tqma8mpql: add USB DR support"). So IMHO this might 
not the best idea.
How to proceed here? Maybe Shawn can take this one once the other 3 patches 
hit linux-next.

Best regards,
Alexander

Re: Re: [PATCH v2 4/4] arm64: dts: tqma8mpql: add support for 2nd USB (host) interface

[Greg Kroah-Hartman]

On Thu, Sep 22, 2022 at 03:39:01PM +0200, Alexander Stein wrote:
> Hi Greg,
> 
> Am Donnerstag, 22. September 2022, 15:17:06 CEST schrieb Greg Kroah-Hartman:
> > On Thu, Sep 15, 2022 at 08:28:55AM +0200, Alexander Stein wrote:
> > > The on-board USB hub has a single reset line which needs to be enabled.
> > > 
> > > Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
> > > ---
> > > 
> > >  .../freescale/imx8mp-tqma8mpql-mba8mpxl.dts   | 41 +++++++++++++++++++
> > >  1 file changed, 41 insertions(+)
> > 
> > This patch failed to apply, please rebase and resend.
> 
> If I rebase this one to usb-testing (or usb-next) this will conflict with 
> additional patches for this file already in linux-next later on, especially 
> fb4f0b69565e ("arm64: dts: tqma8mpql: add USB DR support"). So IMHO this might 
> not the best idea.
> How to proceed here? Maybe Shawn can take this one once the other 3 patches 
> hit linux-next.

Yeah, or just wait for 6.1-rc1 to come out?

Your call,

greg k-h

Re: Re: [PATCH v2 4/4] arm64: dts: tqma8mpql: add support for 2nd USB (host) interface

[Alexander Stein]

Hi Shawn,

Am Donnerstag, 22. September 2022, 15:47:02 CEST schrieb Greg Kroah-Hartman:
> On Thu, Sep 22, 2022 at 03:39:01PM +0200, Alexander Stein wrote:
> > Hi Greg,
> > 
> > Am Donnerstag, 22. September 2022, 15:17:06 CEST schrieb Greg Kroah-
Hartman:
> > > On Thu, Sep 15, 2022 at 08:28:55AM +0200, Alexander Stein wrote:
> > > > The on-board USB hub has a single reset line which needs to be
> > > > enabled.
> > > > 
> > > > Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
> > > > ---
> > > > 
> > > >  .../freescale/imx8mp-tqma8mpql-mba8mpxl.dts   | 41
> > > >  +++++++++++++++++++
> > > >  1 file changed, 41 insertions(+)
> > > 
> > > This patch failed to apply, please rebase and resend.
> > 
> > If I rebase this one to usb-testing (or usb-next) this will conflict with
> > additional patches for this file already in linux-next later on,
> > especially
> > fb4f0b69565e ("arm64: dts: tqma8mpql: add USB DR support"). So IMHO this
> > might not the best idea.
> > How to proceed here? Maybe Shawn can take this one once the other 3
> > patches
> > hit linux-next.
> 
> Yeah, or just wait for 6.1-rc1 to come out?
> 
> Your call,

now that patches 1 till 3 have hit linux-next, feel free to pick patch 4 into 
your tree.

Best regards,
Alexander

Re: [PATCH v2 4/4] arm64: dts: tqma8mpql: add support for 2nd USB (host) interface

[Shawn Guo]

On Thu, Sep 15, 2022 at 08:28:55AM +0200, Alexander Stein wrote:
> The on-board USB hub has a single reset line which needs to be enabled.
> 
> Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>

Applied, thanks!