Skip to contentSkip to conversation

arm64: dts: qcom: sc7280: move USB wakeup-source property

PATCH Applied Johan Hovold 4 participants 7 messages Aug 2, 2022 – Aug 29, 2022

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: dts: qcom: sc7280: move USB wakeup-source property

Move the USB-controller wakeup-source property to the dwc3 glue node to match the updated binding.

---

This one can be applied once the following series has been merged:

	https://lore.kernel.org/all/[email protected]

Johan

 arch/arm64/boot/dts/qcom/sc7280.dtsi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sc7280.dtsi +2 -1
index 13d7f267b289..dac3b69e314f 100644
@@ -3374,6 +3374,8 @@ usb_1: usb@a6f8800 {
 					<&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_USB3_0 0>;
 			interconnect-names = "usb-ddr", "apps-usb";
 
+			wakeup-source;
+
 			usb_1_dwc3: usb@a600000 {
 				compatible = "snps,dwc3";
 				reg = <0 0x0a600000 0 0xe000>;
@@ -3384,7 +3386,6 @@ usb_1_dwc3: usb@a600000 {
 				phys = <&usb_1_hsphy>, <&usb_1_ssphy>;
 				phy-names = "usb2-phy", "usb3-phy";
 				maximum-speed = "super-speed";
-				wakeup-source;
 			};
 		};
 
Signature · 1 line
2.35.1
#1 lore raw
Quoted 9 lines · Johan Hovold

Move the USB-controller wakeup-source property to the dwc3 glue node to match the updated binding.

---

This one can be applied once the following series has been merged:

	https://lore.kernel.org/all/[email protected]

The above series has now been merged (for 6.0):

https://lore.kernel.org/all/[email protected]/

so that this patch can be applied.

Quoted 17 lines
 arch/arm64/boot/dts/qcom/sc7280.dtsi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sc7280.dtsi +2 -0
index 13d7f267b289..dac3b69e314f 100644
@@ -3374,6 +3374,8 @@ usb_1: usb@a6f8800 {
 					<&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_USB3_0 0>;
 			interconnect-names = "usb-ddr", "apps-usb";
 
+			wakeup-source;
+
 			usb_1_dwc3: usb@a600000 {
 				compatible = "snps,dwc3";
 				reg = <0 0x0a600000 0 0xe000>;

arch/arm64/boot/dts/qcom/sc7280.dtsi usb_1_dwc3: usb@a600000 { · line 3390

Quoted 6 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +0 -1
@@ -3384,7 +3386,6 @@ usb_1_dwc3: usb@a600000 {
 				phys = <&usb_1_hsphy>, <&usb_1_ssphy>;
 				phy-names = "usb2-phy", "usb3-phy";
 				maximum-speed = "super-speed";
-				wakeup-source;
 			};
 		};

Johan

#2 lore raw
Quoted 9 lines · Johan Hovold
Quoted 8 lines · Johan Hovold

Move the USB-controller wakeup-source property to the dwc3 glue node to match the updated binding.

---

This one can be applied once the following series has been merged:

Quoted 7 lines
Quoted 1 line
	https://lore.kernel.org/all/[email protected]

The above series has now been merged (for 6.0):

https://lore.kernel.org/all/[email protected]/

so that this patch can be applied.

Please apply it together with "clk: qcom: gcc-sc7280: Keep USB GDSC power domains on when USB wakeup is enabled" [1], otherwise USB wakeup won't work, and worse, USB would be broken after returning from system suspend.

[1] https://patchwork.kernel.org/project/linux-arm-msm/patch/20220822115246.2.If09027f73daa6e1ed95f5eab02326b543c67132e@changeid/

#3 lore raw
Quoted 14 lines · Matthias Kaehlcke
Quoted 13 lines · Johan Hovold
Quoted 9 lines · Johan Hovold

Move the USB-controller wakeup-source property to the dwc3 glue node to match the updated binding.

---

This one can be applied once the following series has been merged:

	https://lore.kernel.org/all/[email protected]

The above series has now been merged (for 6.0):

Quoted 7 lines
Quoted 3 lines

https://lore.kernel.org/all/[email protected]/

so that this patch can be applied.

Please apply it together with "clk: qcom: gcc-sc7280: Keep USB GDSC power domains on when USB wakeup is enabled" [1], otherwise USB wakeup won't work, and worse, USB would be broken after returning from system suspend.

If you really need [1] for wakeup to work then it's already broken as the hack added to 6.0-rc1 that kept the power domain on in suspend has been reverted.

If [1] is also needed for USB to work after resume, we either have a bigger problem as I alluded to in my comment to [1] (and the PD needs to be always on) or this is due to the PHY no longer being powered down in suspend.

Only in the latter case, does this patch need to be held of until [1] has been merged AFAICT.

Johan

Quoted 1 line

[1] https://patchwork.kernel.org/project/linux-arm-msm/patch/20220822115246.2.If09027f73daa6e1ed95f5eab02326b543c67132e@changeid/

#4 lore raw
Quoted 19 lines · Johan Hovold
Quoted 18 lines · Matthias Kaehlcke
Quoted 16 lines · Johan Hovold
Quoted 9 lines · Johan Hovold

Move the USB-controller wakeup-source property to the dwc3 glue node to match the updated binding.

---

This one can be applied once the following series has been merged:

	https://lore.kernel.org/all/[email protected]

The above series has now been merged (for 6.0):

https://lore.kernel.org/all/[email protected]/

so that this patch can be applied.

Quoted 7 lines
Quoted 3 lines

Please apply it together with "clk: qcom: gcc-sc7280: Keep USB GDSC power domains on when USB wakeup is enabled" [1], otherwise USB wakeup won't work, and worse, USB would be broken after returning from system suspend.

If you really need [1] for wakeup to work then it's already broken as the hack added to 6.0-rc1 that kept the power domain on in suspend has been reverted.

Yep, in v6.0-rc1 it is already broken, it should still work in the current qcom tree. In any case wakeup isn't the primary concern, wakeup support for sc7x80 just landed in a not-so-great shape, and your patches in v6.0-rc generally improve it.

Quoted 4 lines

If [1] is also needed for USB to work after resume, we either have a bigger problem as I alluded to in my comment to [1] (and the PD needs to be always on) or this is due to the PHY no longer being powered down in suspend.

Yes, it is apparently related with the PHYs no longer being powered down in suspend. With your patch that reverts that [1] wakeup still works (as long as wakeup for the dwc3 core remains enabled) and USB is operational after resume.

So as long as the PHYs are powered down in suspend it shouldn't be necessary to keep the GDSC PDs on. For Chrome OS we'll have to evaluate whether that is an option (we observe high power consumption of an onboard USB hub during system suspend when the PHYs are off) or whether sone mechanism (quirk, kconfig option, ...) is needed to keep the PHYs on.

[1] https://patchwork.kernel.org/project/linux-usb/patch/[email protected]/

Quoted 6 lines

Only in the latter case, does this patch need to be held of until [1] has been merged AFAICT.

Johan

Quoted 1 line

[1] https://patchwork.kernel.org/project/linux-arm-msm/patch/20220822115246.2.If09027f73daa6e1ed95f5eab02326b543c67132e@changeid/

maintainer Applied
#6 lore raw
In reply to Johan Hovold
Quoted 4 lines · Johan Hovold

Move the USB-controller wakeup-source property to the dwc3 glue node to match the updated binding.

Applied, thanks!

[1/1] arm64: dts: qcom: sc7280: move USB wakeup-source property

      commit: d5089f79b1e4fad445daa48382380a7e584603e2

Best regards,

Signature · 1 line
Bjorn Andersson <[email protected]>