* [PATCH v2] arm64: dts: rockchip: add u2phy clock for ehci and ohci of rk3399
@ 2016-12-21 10:29 Xing Zheng
2016-12-21 10:41 ` [RESEND PATCH " Xing Zheng
0 siblings, 1 reply; 6+ messages in thread
From: Xing Zheng @ 2016-12-21 10:29 UTC (permalink / raw)
To: linux-rockchip
Cc: dianders, heiko, William wu, Xing Zheng, Rob Herring,
Mark Rutland, Catalin Marinas, Will Deacon, Douglas Anderson,
Caesar Wang, Brian Norris, Shawn Lin, Jianqun Xu, Elaine Zhang,
David Wu, devicetree, linux-arm-kernel, linux-kernel
From: William wu <wulf@rock-chips.com>
We found that the suspend process was blocked when it run into
ehci/ohci module due to clk-480m of usb2-phy was disabled.
The root cause is that usb2-phy suspended earlier than ehci/ohci
(usb2-phy will be auto suspended if no devices plug-in). and the
clk-480m provided by it was disabled if no module used. However,
some suspend process related ehci/ohci are base on this clock,
so we should refer it into ehci/ohci driver to prevent this case.
The u2phy clock flow like this:
---
Changes in v2:
- update the commit message
- remove patches whic add and export the USBPHYx_480M_SRC clock IDs
u2phy ________________
| | |-----> UTMI_CLK ---------> | EHCI |
OSC_24M ---|---> PHY_PLL----|----|
|________^_______| |-----> 480M_CLK ---|G|---> | USBPHY_480M_SRC| ----> USBPHY_480M for SoC
|
|
GRF
---
Signed-off-by: William wu <wulf@rock-chips.com>
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
---
arch/arm64/boot/dts/rockchip/rk3399.dtsi | 28 ++++++++++++++++++++--------
1 file changed, 20 insertions(+), 8 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index b65c193..2ad9255 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -315,8 +315,10 @@
compatible = "generic-ehci";
reg = <0x0 0xfe380000 0x0 0x20000>;
interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH 0>;
- clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST0_ARB>;
- clock-names = "hclk_host0", "hclk_host0_arb";
+ clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST0_ARB>,
+ <&u2phy0>;
+ clock-names = "usbhost", "arbiter",
+ "utmi";
phys = <&u2phy0_host>;
phy-names = "usb";
status = "disabled";
@@ -326,8 +328,12 @@
compatible = "generic-ohci";
reg = <0x0 0xfe3a0000 0x0 0x20000>;
interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH 0>;
- clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST0_ARB>;
- clock-names = "hclk_host0", "hclk_host0_arb";
+ clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST0_ARB>,
+ <&u2phy0>;
+ clock-names = "usbhost", "arbiter",
+ "utmi";
+ phys = <&u2phy0_host>;
+ phy-names = "usb";
status = "disabled";
};
@@ -335,8 +341,10 @@
compatible = "generic-ehci";
reg = <0x0 0xfe3c0000 0x0 0x20000>;
interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH 0>;
- clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST1_ARB>;
- clock-names = "hclk_host1", "hclk_host1_arb";
+ clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST1_ARB>,
+ <&u2phy1>;
+ clock-names = "usbhost", "arbiter",
+ "utmi";
phys = <&u2phy1_host>;
phy-names = "usb";
status = "disabled";
@@ -346,8 +354,12 @@
compatible = "generic-ohci";
reg = <0x0 0xfe3e0000 0x0 0x20000>;
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH 0>;
- clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST1_ARB>;
- clock-names = "hclk_host1", "hclk_host1_arb";
+ clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST1_ARB>,
+ <&u2phy1>;
+ clock-names = "usbhost", "arbiter",
+ "utmi";
+ phys = <&u2phy1_host>;
+ phy-names = "usb";
status = "disabled";
};
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [RESEND PATCH v2] arm64: dts: rockchip: add u2phy clock for ehci and ohci of rk3399 2016-12-21 10:29 [PATCH v2] arm64: dts: rockchip: add u2phy clock for ehci and ohci of rk3399 Xing Zheng @ 2016-12-21 10:41 ` Xing Zheng 2016-12-22 0:47 ` Doug Anderson 2016-12-27 17:04 ` Heiko Stuebner 0 siblings, 2 replies; 6+ messages in thread From: Xing Zheng @ 2016-12-21 10:41 UTC (permalink / raw) To: heiko, linux-rockchip Cc: robh+dt, mark.rutland, catalin.marinas, will.deacon, dianders, wxt, zhengxing, shawn.lin, briannorris, jay.xu, zhangqing, david.wu, wulf, devicetree, linux-arm-kernel, linux-kernel, dianders, frank.wang From: William wu <wulf@rock-chips.com> We found that the suspend process was blocked when it run into ehci/ohci module due to clk-480m of usb2-phy was disabled. The root cause is that usb2-phy suspended earlier than ehci/ohci (usb2-phy will be auto suspended if no devices plug-in). and the clk-480m provided by it was disabled if no module used. However, some suspend process related ehci/ohci are base on this clock, so we should refer it into ehci/ohci driver to prevent this case. The u2phy clock flow like this: === u2phy ________________ | | |-----> UTMI_CLK ---------> | EHCI | OSC_24M ---|---> PHY_PLL----|----| |________^_______| |-----> 480M_CLK ---|G|---> | USBPHY_480M_SRC| ----> USBPHY_480M for SoC | | GRF === Signed-off-by: William wu <wulf@rock-chips.com> Signed-off-by: Xing Zheng <zhengxing@rock-chips.com> --- Changes in v2: - update the commit message - remove patches whic add and export the USBPHYx_480M_SRC clock IDs arch/arm64/boot/dts/rockchip/rk3399.dtsi | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index b65c193..2ad9255 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -315,8 +315,10 @@ compatible = "generic-ehci"; reg = <0x0 0xfe380000 0x0 0x20000>; interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH 0>; - clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST0_ARB>; - clock-names = "hclk_host0", "hclk_host0_arb"; + clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST0_ARB>, + <&u2phy0>; + clock-names = "usbhost", "arbiter", + "utmi"; phys = <&u2phy0_host>; phy-names = "usb"; status = "disabled"; @@ -326,8 +328,12 @@ compatible = "generic-ohci"; reg = <0x0 0xfe3a0000 0x0 0x20000>; interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH 0>; - clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST0_ARB>; - clock-names = "hclk_host0", "hclk_host0_arb"; + clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST0_ARB>, + <&u2phy0>; + clock-names = "usbhost", "arbiter", + "utmi"; + phys = <&u2phy0_host>; + phy-names = "usb"; status = "disabled"; }; @@ -335,8 +341,10 @@ compatible = "generic-ehci"; reg = <0x0 0xfe3c0000 0x0 0x20000>; interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH 0>; - clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST1_ARB>; - clock-names = "hclk_host1", "hclk_host1_arb"; + clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST1_ARB>, + <&u2phy1>; + clock-names = "usbhost", "arbiter", + "utmi"; phys = <&u2phy1_host>; phy-names = "usb"; status = "disabled"; @@ -346,8 +354,12 @@ compatible = "generic-ohci"; reg = <0x0 0xfe3e0000 0x0 0x20000>; interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH 0>; - clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST1_ARB>; - clock-names = "hclk_host1", "hclk_host1_arb"; + clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST1_ARB>, + <&u2phy1>; + clock-names = "usbhost", "arbiter", + "utmi"; + phys = <&u2phy1_host>; + phy-names = "usb"; status = "disabled"; }; -- 2.7.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [RESEND PATCH v2] arm64: dts: rockchip: add u2phy clock for ehci and ohci of rk3399 2016-12-21 10:41 ` [RESEND PATCH " Xing Zheng @ 2016-12-22 0:47 ` Doug Anderson 2016-12-22 1:15 ` Xing Zheng 2016-12-22 13:54 ` wlf 2016-12-27 17:04 ` Heiko Stuebner 1 sibling, 2 replies; 6+ messages in thread From: Doug Anderson @ 2016-12-22 0:47 UTC (permalink / raw) To: Xing Zheng Cc: Heiko Stübner, open list:ARM/Rockchip SoC..., Rob Herring, Mark Rutland, Catalin Marinas, Will Deacon, Caesar, Shawn Lin, Brian Norris, Jianqun, zhangqing, David Wu, wulf, devicetree, linux-arm-kernel, linux-kernel, Frank Wang Hi, On Wed, Dec 21, 2016 at 2:41 AM, Xing Zheng <zhengxing@rock-chips.com> wrote: > From: William wu <wulf@rock-chips.com> > > We found that the suspend process was blocked when it run into > ehci/ohci module due to clk-480m of usb2-phy was disabled. > > The root cause is that usb2-phy suspended earlier than ehci/ohci > (usb2-phy will be auto suspended if no devices plug-in). and the > clk-480m provided by it was disabled if no module used. However, > some suspend process related ehci/ohci are base on this clock, > so we should refer it into ehci/ohci driver to prevent this case. > > The u2phy clock flow like this: > === > u2phy ________________ > | | |-----> UTMI_CLK ---------> | EHCI | > OSC_24M ---|---> PHY_PLL----|----| > |________^_______| |-----> 480M_CLK ---|G|---> | USBPHY_480M_SRC| ----> USBPHY_480M for SoC > | > | > GRF > === > > Signed-off-by: William wu <wulf@rock-chips.com> > Signed-off-by: Xing Zheng <zhengxing@rock-chips.com> > --- > > Changes in v2: > - update the commit message > - remove patches whic add and export the USBPHYx_480M_SRC clock IDs > > arch/arm64/boot/dts/rockchip/rk3399.dtsi | 28 ++++++++++++++++++++-------- > 1 file changed, 20 insertions(+), 8 deletions(-) > > diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi > index b65c193..2ad9255 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi > +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi > @@ -315,8 +315,10 @@ > compatible = "generic-ehci"; > reg = <0x0 0xfe380000 0x0 0x20000>; > interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH 0>; > - clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST0_ARB>; > - clock-names = "hclk_host0", "hclk_host0_arb"; > + clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST0_ARB>, > + <&u2phy0>; > + clock-names = "usbhost", "arbiter", > + "utmi"; > phys = <&u2phy0_host>; > phy-names = "usb"; > status = "disabled"; > @@ -326,8 +328,12 @@ > compatible = "generic-ohci"; > reg = <0x0 0xfe3a0000 0x0 0x20000>; > interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH 0>; > - clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST0_ARB>; > - clock-names = "hclk_host0", "hclk_host0_arb"; > + clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST0_ARB>, > + <&u2phy0>; > + clock-names = "usbhost", "arbiter", > + "utmi"; > + phys = <&u2phy0_host>; > + phy-names = "usb"; > status = "disabled"; > }; > > @@ -335,8 +341,10 @@ > compatible = "generic-ehci"; > reg = <0x0 0xfe3c0000 0x0 0x20000>; > interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH 0>; > - clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST1_ARB>; > - clock-names = "hclk_host1", "hclk_host1_arb"; > + clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST1_ARB>, > + <&u2phy1>; > + clock-names = "usbhost", "arbiter", > + "utmi"; > phys = <&u2phy1_host>; > phy-names = "usb"; > status = "disabled"; > @@ -346,8 +354,12 @@ > compatible = "generic-ohci"; > reg = <0x0 0xfe3e0000 0x0 0x20000>; > interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH 0>; > - clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST1_ARB>; > - clock-names = "hclk_host1", "hclk_host1_arb"; > + clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST1_ARB>, > + <&u2phy1>; > + clock-names = "usbhost", "arbiter", > + "utmi"; > + phys = <&u2phy1_host>; > + phy-names = "usb"; This all looks better to me. From a device tree point of view it makes lots of sense to expose this PHY clock to the controller. Thus: Reviewed-by: Douglas Anderson <dianders@chromium.org> I can't say that I understand all the interactions between the PHY code and the USB driver, but presumably others have reviewed that more? Offline Heiko pointed me at rockchip_usb2phy_otg_sm_work() which apparently calls rockchip_usb2phy_power_off() and rockchip_usb2phy_power_on() directly sometimes behind the back of the PHY framework. Very strange. I will also say that there were still some unanswered questions from the previous thread, namely: A) Heiko: Also, with the change, the ehci will keep the clock (and thus the phy) always on. Does the phy-autosuspend even save anything now? B) Brian: Is thre a race between power_off() and the delayed work in your USB2 PHY driver? IMHO neither of those two questions affect the correctness of this patch: that this clock ought to be provided to the USB Controller. ...but they both are important questions that should be answered. One other last note is that we probably should be specifying a more specific compatible string, like: "rk3399-ehci", "generic-ehci" That will allow us later to use these same device tree files and perhaps deal with the clocks / PHYs in a more efficient way. -Doug ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [RESEND PATCH v2] arm64: dts: rockchip: add u2phy clock for ehci and ohci of rk3399 2016-12-22 0:47 ` Doug Anderson @ 2016-12-22 1:15 ` Xing Zheng 2016-12-22 13:54 ` wlf 1 sibling, 0 replies; 6+ messages in thread From: Xing Zheng @ 2016-12-22 1:15 UTC (permalink / raw) To: Doug Anderson Cc: Heiko Stübner, open list:ARM/Rockchip SoC..., Rob Herring, Mark Rutland, Catalin Marinas, Will Deacon, Caesar, Shawn Lin, Brian Norris, Jianqun, zhangqing, David Wu, wulf, devicetree, linux-arm-kernel, linux-kernel, Frank Wang, 郑兴 Hi Doug, 在 2016年12月22日 08:47, Doug Anderson 写道: > Hi, > > On Wed, Dec 21, 2016 at 2:41 AM, Xing Zheng <zhengxing@rock-chips.com> wrote: >> From: William wu <wulf@rock-chips.com> >> >> We found that the suspend process was blocked when it run into >> ehci/ohci module due to clk-480m of usb2-phy was disabled. >> >> The root cause is that usb2-phy suspended earlier than ehci/ohci >> (usb2-phy will be auto suspended if no devices plug-in). and the >> clk-480m provided by it was disabled if no module used. However, >> some suspend process related ehci/ohci are base on this clock, >> so we should refer it into ehci/ohci driver to prevent this case. >> >> The u2phy clock flow like this: >> === >> u2phy ________________ >> | | |-----> UTMI_CLK ---------> | EHCI | >> OSC_24M ---|---> PHY_PLL----|----| >> |________^_______| |-----> 480M_CLK ---|G|---> | USBPHY_480M_SRC| ----> USBPHY_480M for SoC >> | >> | >> GRF >> === >> >> Signed-off-by: William wu <wulf@rock-chips.com> >> Signed-off-by: Xing Zheng <zhengxing@rock-chips.com> >> --- >> >> Changes in v2: >> - update the commit message >> - remove patches whic add and export the USBPHYx_480M_SRC clock IDs >> >> arch/arm64/boot/dts/rockchip/rk3399.dtsi | 28 ++++++++++++++++++++-------- >> 1 file changed, 20 insertions(+), 8 deletions(-) >> >> diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi >> index b65c193..2ad9255 100644 >> --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi >> +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi >> @@ -315,8 +315,10 @@ >> compatible = "generic-ehci"; >> reg = <0x0 0xfe380000 0x0 0x20000>; >> interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH 0>; >> - clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST0_ARB>; >> - clock-names = "hclk_host0", "hclk_host0_arb"; >> + clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST0_ARB>, >> + <&u2phy0>; >> + clock-names = "usbhost", "arbiter", >> + "utmi"; >> phys = <&u2phy0_host>; >> phy-names = "usb"; >> status = "disabled"; >> @@ -326,8 +328,12 @@ >> compatible = "generic-ohci"; >> reg = <0x0 0xfe3a0000 0x0 0x20000>; >> interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH 0>; >> - clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST0_ARB>; >> - clock-names = "hclk_host0", "hclk_host0_arb"; >> + clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST0_ARB>, >> + <&u2phy0>; >> + clock-names = "usbhost", "arbiter", >> + "utmi"; >> + phys = <&u2phy0_host>; >> + phy-names = "usb"; >> status = "disabled"; >> }; >> >> @@ -335,8 +341,10 @@ >> compatible = "generic-ehci"; >> reg = <0x0 0xfe3c0000 0x0 0x20000>; >> interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH 0>; >> - clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST1_ARB>; >> - clock-names = "hclk_host1", "hclk_host1_arb"; >> + clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST1_ARB>, >> + <&u2phy1>; >> + clock-names = "usbhost", "arbiter", >> + "utmi"; >> phys = <&u2phy1_host>; >> phy-names = "usb"; >> status = "disabled"; >> @@ -346,8 +354,12 @@ >> compatible = "generic-ohci"; >> reg = <0x0 0xfe3e0000 0x0 0x20000>; >> interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH 0>; >> - clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST1_ARB>; >> - clock-names = "hclk_host1", "hclk_host1_arb"; >> + clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST1_ARB>, >> + <&u2phy1>; >> + clock-names = "usbhost", "arbiter", >> + "utmi"; >> + phys = <&u2phy1_host>; >> + phy-names = "usb"; > This all looks better to me. From a device tree point of view it > makes lots of sense to expose this PHY clock to the controller. Thus: > > Reviewed-by: Douglas Anderson <dianders@chromium.org> > > > I can't say that I understand all the interactions between the PHY > code and the USB driver, but presumably others have reviewed that > more? Offline Heiko pointed me at rockchip_usb2phy_otg_sm_work() > which apparently calls rockchip_usb2phy_power_off() and > rockchip_usb2phy_power_on() directly sometimes behind the back of the > PHY framework. Very strange. > > > I will also say that there were still some unanswered questions from > the previous thread, namely: > > A) Heiko: Also, with the change, the ehci will keep the clock (and > thus the phy) always on. Does the phy-autosuspend even save anything > now? > > B) Brian: Is thre a race between power_off() and the delayed work in > your USB2 PHY driver? > > > IMHO neither of those two questions affect the correctness of this > patch: that this clock ought to be provided to the USB Controller. > ...but they both are important questions that should be answered. > > One other last note is that we probably should be specifying a more > specific compatible string, like: > > "rk3399-ehci", "generic-ehci" > > That will allow us later to use these same device tree files and > perhaps deal with the clocks / PHYs in a more efficient way. > > > -Doug > I will *ping* Frank and William to answer your questions until they finish the business travel. Thanks. -- - Xing Zheng ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [RESEND PATCH v2] arm64: dts: rockchip: add u2phy clock for ehci and ohci of rk3399 2016-12-22 0:47 ` Doug Anderson 2016-12-22 1:15 ` Xing Zheng @ 2016-12-22 13:54 ` wlf 1 sibling, 0 replies; 6+ messages in thread From: wlf @ 2016-12-22 13:54 UTC (permalink / raw) To: Doug Anderson, Xing Zheng Cc: Heiko Stübner, open list:ARM/Rockchip SoC..., Rob Herring, Mark Rutland, Catalin Marinas, Will Deacon, Caesar, Shawn Lin, Brian Norris, Jianqun, zhangqing, David Wu, devicetree, linux-arm-kernel, linux-kernel, Frank Wang, Huang, Tao Dear Doug & Xing Zheng, 在 2016年12月22日 08:47, Doug Anderson 写道: > Hi, > > On Wed, Dec 21, 2016 at 2:41 AM, Xing Zheng <zhengxing@rock-chips.com> wrote: >> From: William wu <wulf@rock-chips.com> >> >> We found that the suspend process was blocked when it run into >> ehci/ohci module due to clk-480m of usb2-phy was disabled. >> >> The root cause is that usb2-phy suspended earlier than ehci/ohci >> (usb2-phy will be auto suspended if no devices plug-in). and the >> clk-480m provided by it was disabled if no module used. However, I suggest that change the "clk-480m" to "utmi clock" here. >> some suspend process related ehci/ohci are base on this clock, >> so we should refer it into ehci/ohci driver to prevent this case. >> >> The u2phy clock flow like this: >> === >> u2phy ________________ >> | | |-----> UTMI_CLK ---------> | EHCI | >> OSC_24M ---|---> PHY_PLL----|----| >> |________^_______| |-----> 480M_CLK ---|G|---> | USBPHY_480M_SRC| ----> USBPHY_480M for SoC >> | >> | >> GRF >> === >> >> Signed-off-by: William wu <wulf@rock-chips.com> >> Signed-off-by: Xing Zheng <zhengxing@rock-chips.com> >> --- >> >> Changes in v2: >> - update the commit message >> - remove patches whic add and export the USBPHYx_480M_SRC clock IDs >> >> arch/arm64/boot/dts/rockchip/rk3399.dtsi | 28 ++++++++++++++++++++-------- >> 1 file changed, 20 insertions(+), 8 deletions(-) >> >> diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi >> index b65c193..2ad9255 100644 >> --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi >> +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi >> @@ -315,8 +315,10 @@ >> compatible = "generic-ehci"; >> reg = <0x0 0xfe380000 0x0 0x20000>; >> interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH 0>; >> - clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST0_ARB>; >> - clock-names = "hclk_host0", "hclk_host0_arb"; >> + clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST0_ARB>, >> + <&u2phy0>; >> + clock-names = "usbhost", "arbiter", >> + "utmi"; >> phys = <&u2phy0_host>; >> phy-names = "usb"; >> status = "disabled"; >> @@ -326,8 +328,12 @@ >> compatible = "generic-ohci"; >> reg = <0x0 0xfe3a0000 0x0 0x20000>; >> interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH 0>; >> - clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST0_ARB>; >> - clock-names = "hclk_host0", "hclk_host0_arb"; >> + clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST0_ARB>, >> + <&u2phy0>; >> + clock-names = "usbhost", "arbiter", >> + "utmi"; >> + phys = <&u2phy0_host>; >> + phy-names = "usb"; >> status = "disabled"; >> }; >> >> @@ -335,8 +341,10 @@ >> compatible = "generic-ehci"; >> reg = <0x0 0xfe3c0000 0x0 0x20000>; >> interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH 0>; >> - clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST1_ARB>; >> - clock-names = "hclk_host1", "hclk_host1_arb"; >> + clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST1_ARB>, >> + <&u2phy1>; >> + clock-names = "usbhost", "arbiter", >> + "utmi"; >> phys = <&u2phy1_host>; >> phy-names = "usb"; >> status = "disabled"; >> @@ -346,8 +354,12 @@ >> compatible = "generic-ohci"; >> reg = <0x0 0xfe3e0000 0x0 0x20000>; >> interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH 0>; >> - clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST1_ARB>; >> - clock-names = "hclk_host1", "hclk_host1_arb"; >> + clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST1_ARB>, >> + <&u2phy1>; >> + clock-names = "usbhost", "arbiter", >> + "utmi"; >> + phys = <&u2phy1_host>; >> + phy-names = "usb"; > This all looks better to me. From a device tree point of view it > makes lots of sense to expose this PHY clock to the controller. Thus: > > Reviewed-by: Douglas Anderson <dianders@chromium.org> > > > I can't say that I understand all the interactions between the PHY > code and the USB driver, but presumably others have reviewed that > more? Offline Heiko pointed me at rockchip_usb2phy_otg_sm_work() > which apparently calls rockchip_usb2phy_power_off() and > rockchip_usb2phy_power_on() directly sometimes behind the back of the > PHY framework. Very strange. Yes, the rockchip_usb2phy_otg_sm_work() in the USB2 PHY driver and EHCI/OHCI platform driver via the PHY framework can both do phy power on/off. We do that because we want to reduce USB2 PHY consumption in system runtime and deep sleep. For EHCI/OHCI platform drivers, they call phy_power_on() in probe to power on USB2 PHY, and don't power off USB2 PHY in system runtime, even if there's no USB2 device connected. They just call phy_power_off() in PM suspend, and call phy_power_on() in PM resume to power on USB2 PHY again. AKA the EHCI/OHCI platform driver can only support USB power management in deep sleep. So we add a work in USB2 PHY driver to manage USB2 PHY power. The work scheduled every 60 seconds, check the USB D+/D- and disconnect status in GRF registers to know if any USB device connected. If no USB connected, it will call rockchip_usb2phy_power_off() to power off USB2 PHY. And also, the USB2 PHY driver use an irq to detect D+/D- voltage when USB device connected， and then call rockchip_usb2phy_power_on() to power on USB2 PHY. AKA the work is used to support USB PHY power management in runtime. > > > I will also say that there were still some unanswered questions from > the previous thread, namely: > > A) Heiko: Also, with the change, the ehci will keep the clock (and > thus the phy) always on. Does the phy-autosuspend even save anything > now? With this patch, the GRF USB commonon will always enable in system runtime. But we still can set USB2 PHY enter suspend mode by power down most of PHY logic module via GRF, so the phy-autosuspend is still useful. On the other hand, commonon bit is used for PLL clock logical, its power consumption is not big in theory, I remember that I tested on the other SoC， the commonon bit consumed about 1~2mA. > B) Brian: Is thre a race between power_off() and the delayed work in > your USB2 PHY driver? I'm not clear understand the race mentioned here. IMO, PHY framework power_off() and work rockchip_usb2phy_power_off() don't have race problem. And maybe there is a race between PHY framework power_off() and the delayed work rockchip_usb2phy_power_on() in USB2 PHY driver, but I think the probability is low， the race case maybe： 1. EHCI/OHCI platform call phy_power_off() in PM suspend; 2. Plug in an USB device after USB2 PHY has entered suspend; 3. Power on USB2 PHY again in work; 4. After these, finally the USB2 PHY is power on when system enter sleep. > > > IMHO neither of those two questions affect the correctness of this > patch: that this clock ought to be provided to the USB Controller. > ...but they both are important questions that should be answered. > > One other last note is that we probably should be specifying a more > specific compatible string, like: > > "rk3399-ehci", "generic-ehci" > > That will allow us later to use these same device tree files and > perhaps deal with the clocks / PHYs in a more efficient way. > > > -Doug > > > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [RESEND PATCH v2] arm64: dts: rockchip: add u2phy clock for ehci and ohci of rk3399 2016-12-21 10:41 ` [RESEND PATCH " Xing Zheng 2016-12-22 0:47 ` Doug Anderson @ 2016-12-27 17:04 ` Heiko Stuebner 1 sibling, 0 replies; 6+ messages in thread From: Heiko Stuebner @ 2016-12-27 17:04 UTC (permalink / raw) To: Xing Zheng Cc: linux-rockchip, robh+dt, mark.rutland, catalin.marinas, will.deacon, dianders, wxt, shawn.lin, briannorris, jay.xu, zhangqing, david.wu, wulf, devicetree, linux-arm-kernel, linux-kernel, dianders, frank.wang Am Mittwoch, 21. Dezember 2016, 18:41:05 CET schrieb Xing Zheng: > From: William wu <wulf@rock-chips.com> > > We found that the suspend process was blocked when it run into > ehci/ohci module due to clk-480m of usb2-phy was disabled. > > The root cause is that usb2-phy suspended earlier than ehci/ohci > (usb2-phy will be auto suspended if no devices plug-in). and the > clk-480m provided by it was disabled if no module used. However, > some suspend process related ehci/ohci are base on this clock, > so we should refer it into ehci/ohci driver to prevent this case. > > The u2phy clock flow like this: > === > u2phy ________________ > > | | |-----> UTMI_CLK ---------> | EHCI | > > OSC_24M ---|---> PHY_PLL----|----| > > |________^_______| |-----> 480M_CLK ---|G|---> | > |USBPHY_480M_SRC| ----> USBPHY_480M for SoC > GRF > === > > Signed-off-by: William wu <wulf@rock-chips.com> > Signed-off-by: Xing Zheng <zhengxing@rock-chips.com> applied for 4.11 with Doug's Review-tag Thanks Heiko ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-12-27 17:04 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2016-12-21 10:29 [PATCH v2] arm64: dts: rockchip: add u2phy clock for ehci and ohci of rk3399 Xing Zheng 2016-12-21 10:41 ` [RESEND PATCH " Xing Zheng 2016-12-22 0:47 ` Doug Anderson 2016-12-22 1:15 ` Xing Zheng 2016-12-22 13:54 ` wlf 2016-12-27 17:04 ` Heiko Stuebner
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).