arm64: dts: qcom: fix USB wakeup interrupts again

---
 arch/arm64/boot/dts/qcom/sc8180x.dtsi | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

arch/arm64/boot/dts/qcom/sc8180x.dtsi +8 -8

index 7a9cb0418ac1..8f95779c75fa 100644
@@ -2548,10 +2548,10 @@ gem_noc: interconnect@9680000 {
 		usb_prim: usb@a6f8800 {
 			compatible = "qcom,sc8180x-dwc3", "qcom,dwc3";
 			reg = <0 0x0a6f8800 0 0x400>;
-			interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 486 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 488 IRQ_TYPE_EDGE_BOTH>,
-				     <GIC_SPI 489 IRQ_TYPE_EDGE_BOTH>;
+			interrupts-extended = <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
+					      <&intc GIC_SPI 486 IRQ_TYPE_LEVEL_HIGH>,
+					      <&pdc 8 IRQ_TYPE_EDGE_BOTH>,
+					      <&pdc 9 IRQ_TYPE_EDGE_BOTH>;
 			interrupt-names = "hs_phy_irq",
 					  "ss_phy_irq",
 					  "dm_hs_phy_irq",

@@ -2622,10 +2622,10 @@ usb_sec: usb@a8f8800 {
 				      "xo";
 			resets = <&gcc GCC_USB30_SEC_BCR>;
 			power-domains = <&gcc USB30_SEC_GDSC>;
-			interrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 487 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 490 IRQ_TYPE_EDGE_BOTH>,
-				     <GIC_SPI 491 IRQ_TYPE_EDGE_BOTH>;
+			interrupts-extended = <&intc GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>,
+					      <&intc GIC_SPI 487 IRQ_TYPE_LEVEL_HIGH>,
+					      <&pdc 10 IRQ_TYPE_EDGE_BOTH>,
+					      <&pdc 11 IRQ_TYPE_EDGE_BOTH>;
 			interrupt-names = "hs_phy_irq", "ss_phy_irq",
 					  "dm_hs_phy_irq", "dp_hs_phy_irq";

Signature · 1 line

2.41.0

Konrad Dybcio

Reviewed-by Tested-by on v1 1/5

2023-12-14 18:00 UTC #2 lore raw

Re: [PATCH 1/5] arm64: dts: qcom: sc8180x: fix USB DP/DM HS PHY interrupts

Quoted 10 lines · Johan Hovold

The USB DP/DM HS PHY interrupts need to be provided by the PDC interrupt controller in order to be able to wake the system up from low-power states and to be able to detect disconnect events, which requires triggering on falling edges.
A recent commit updated the trigger type but failed to change the interrupt provider as required. This leads to the current Linux driver failing to probe instead of printing an error during suspend and USB wakeup not working as intended.

Quoted 7 lines

Fixes 0dc0f6da3d43 ("arm64: dts: qcom: sc8180x: fix USB wakeup interrupt types")
Fixes b080f53a8f44 ("arm64: dts: qcom: sc8180x: Add remoteprocs, wifi and usb nodes")
Cc [email protected] # 6.5
Cc Vinod Koul <[email protected]>
Reported-by Konrad Dybcio <[email protected]>
Signed-off-by Johan Hovold <[email protected]>
---

Tested-by Konrad Dybcio <[email protected]>

Konrad

Johan Hovold

author

2023-12-13 17:34 UTC #3 lore raw

PATCH 2/5 arm64: dts: qcom: sdm845: fix USB DP/DM HS PHY interrupts

Fixes 84ad9ac8d9ca ("arm64: dts: qcom: sdm845: fix USB wakeup interrupt types")

Fixes ca4db2b538a1 ("arm64: dts: qcom: sdm845: Add USB-related nodes")

Cc [email protected] # 4.20

---
 arch/arm64/boot/dts/qcom/sdm845.dtsi | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

arch/arm64/boot/dts/qcom/sdm845.dtsi +8 -8

index 0d2be706505a..97ee02469d69 100644
@@ -4053,10 +4053,10 @@ usb_1: usb@a6f8800 {
 					  <&gcc GCC_USB30_PRIM_MASTER_CLK>;
 			assigned-clock-rates = <19200000>, <150000000>;
 
-			interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 486 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 488 IRQ_TYPE_EDGE_BOTH>,
-				     <GIC_SPI 489 IRQ_TYPE_EDGE_BOTH>;
+			interrupts-extended = <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
+					      <&intc GIC_SPI 486 IRQ_TYPE_LEVEL_HIGH>,
+					      <&pdc_intc 8 IRQ_TYPE_EDGE_BOTH>,
+					      <&pdc_intc 9 IRQ_TYPE_EDGE_BOTH>;
 			interrupt-names = "hs_phy_irq", "ss_phy_irq",
 					  "dm_hs_phy_irq", "dp_hs_phy_irq";

@@ -4104,10 +4104,10 @@ usb_2: usb@a8f8800 {
 					  <&gcc GCC_USB30_SEC_MASTER_CLK>;
 			assigned-clock-rates = <19200000>, <150000000>;
 
-			interrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 487 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 490 IRQ_TYPE_EDGE_BOTH>,
-				     <GIC_SPI 491 IRQ_TYPE_EDGE_BOTH>;
+			interrupts-extended = <&intc GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>,
+					      <&intc GIC_SPI 487 IRQ_TYPE_LEVEL_HIGH>,
+					      <&pdc_intc 10 IRQ_TYPE_EDGE_BOTH>,
+					      <&pdc_intc 11 IRQ_TYPE_EDGE_BOTH>;
 			interrupt-names = "hs_phy_irq", "ss_phy_irq",
 					  "dm_hs_phy_irq", "dp_hs_phy_irq";

Signature · 1 line

2.41.0

Konrad Dybcio

Reviewed-by on v1 2/5

2023-12-13 18:58 UTC #4 lore raw

Re: [PATCH 2/5] arm64: dts: qcom: sdm845: fix USB DP/DM HS PHY interrupts

Quoted 10 lines · Johan Hovold

The USB DP/DM HS PHY interrupts need to be provided by the PDC interrupt controller in order to be able to wake the system up from low-power states and to be able to detect disconnect events, which requires triggering on falling edges.
A recent commit updated the trigger type but failed to change the interrupt provider as required. This leads to the current Linux driver failing to probe instead of printing an error during suspend and USB wakeup not working as intended.

Quoted 5 lines

Fixes 84ad9ac8d9ca ("arm64: dts: qcom: sdm845: fix USB wakeup interrupt types")
Fixes ca4db2b538a1 ("arm64: dts: qcom: sdm845: Add USB-related nodes")
Cc [email protected] # 4.20
Signed-off-by Johan Hovold <[email protected]>
---

Matches ds

Konrad

Johan Hovold

author

2023-12-13 17:34 UTC #5 lore raw

PATCH 3/5 arm64: dts: qcom: sdm845: fix USB SS wakeup

The USB SS PHY interrupts need to be provided by the PDC interrupt controller in order to be able to wake the system up from low-power states.

Fixes ca4db2b538a1 ("arm64: dts: qcom: sdm845: Add USB-related nodes")

Cc [email protected] # 4.20

---
 arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/arm64/boot/dts/qcom/sdm845.dtsi +2 -2

index 97ee02469d69..97929954cde6 100644
@@ -4054,7 +4054,7 @@ usb_1: usb@a6f8800 {
 			assigned-clock-rates = <19200000>, <150000000>;
 
 			interrupts-extended = <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
-					      <&intc GIC_SPI 486 IRQ_TYPE_LEVEL_HIGH>,
+					      <&pdc_intc 6 IRQ_TYPE_LEVEL_HIGH>,
 					      <&pdc_intc 8 IRQ_TYPE_EDGE_BOTH>,
 					      <&pdc_intc 9 IRQ_TYPE_EDGE_BOTH>;
 			interrupt-names = "hs_phy_irq", "ss_phy_irq",

@@ -4105,7 +4105,7 @@ usb_2: usb@a8f8800 {
 			assigned-clock-rates = <19200000>, <150000000>;
 
 			interrupts-extended = <&intc GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>,
-					      <&intc GIC_SPI 487 IRQ_TYPE_LEVEL_HIGH>,
+					      <&pdc_intc 7 IRQ_TYPE_LEVEL_HIGH>,
 					      <&pdc_intc 10 IRQ_TYPE_EDGE_BOTH>,
 					      <&pdc_intc 11 IRQ_TYPE_EDGE_BOTH>;
 			interrupt-names = "hs_phy_irq", "ss_phy_irq",

Signature · 1 line

2.41.0

Konrad Dybcio

Reviewed-by on v1 3/5

2023-12-13 18:58 UTC #6 lore raw

Re: [PATCH 3/5] arm64: dts: qcom: sdm845: fix USB SS wakeup

Quoted 8 lines · Johan Hovold

The USB SS PHY interrupts need to be provided by the PDC interrupt controller in order to be able to wake the system up from low-power states.
Fixes ca4db2b538a1 ("arm64: dts: qcom: sdm845: Add USB-related nodes")
Cc [email protected] # 4.20
Signed-off-by Johan Hovold <[email protected]>
---

Matches ds

Konrad

Johan Hovold

author

2023-12-13 17:34 UTC #7 lore raw

PATCH 4/5 arm64: dts: qcom: sm8150: fix USB DP/DM HS PHY interrupts

Fixes 54524b6987d1 ("arm64: dts: qcom: sm8150: fix USB wakeup interrupt types")

Fixes 0c9dde0d2015 ("arm64: dts: qcom: sm8150: Add secondary USB and PHY nodes")

Fixes b33d2868e8d3 ("arm64: dts: qcom: sm8150: Add USB and PHY device nodes")

Cc [email protected] # 5.10

Cc Jack Pham <[email protected]>

Cc Jonathan Marek <[email protected]>

---
 arch/arm64/boot/dts/qcom/sm8150.dtsi | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

arch/arm64/boot/dts/qcom/sm8150.dtsi +8 -8

index 3e7048d8ac55..5e46b9ef8642 100644
@@ -3565,10 +3565,10 @@ usb_1: usb@a6f8800 {
 					  <&gcc GCC_USB30_PRIM_MASTER_CLK>;
 			assigned-clock-rates = <19200000>, <200000000>;
 
-			interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 486 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 488 IRQ_TYPE_EDGE_BOTH>,
-				     <GIC_SPI 489 IRQ_TYPE_EDGE_BOTH>;
+			interrupts-extended = <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
+					      <&intc GIC_SPI 486 IRQ_TYPE_LEVEL_HIGH>,
+					      <&pdc 8 IRQ_TYPE_EDGE_BOTH>,
+					      <&pdc 9 IRQ_TYPE_EDGE_BOTH>;
 			interrupt-names = "hs_phy_irq", "ss_phy_irq",
 					  "dm_hs_phy_irq", "dp_hs_phy_irq";

@@ -3618,10 +3618,10 @@ usb_2: usb@a8f8800 {
 					  <&gcc GCC_USB30_SEC_MASTER_CLK>;
 			assigned-clock-rates = <19200000>, <200000000>;
 
-			interrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 487 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 490 IRQ_TYPE_EDGE_BOTH>,
-				     <GIC_SPI 491 IRQ_TYPE_EDGE_BOTH>;
+			interrupts-extended = <&intc GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>,
+					      <&intc GIC_SPI 487 IRQ_TYPE_LEVEL_HIGH>,
+					      <&pdc 10 IRQ_TYPE_EDGE_BOTH>,
+					      <&pdc 11 IRQ_TYPE_EDGE_BOTH>;
 			interrupt-names = "hs_phy_irq", "ss_phy_irq",
 					  "dm_hs_phy_irq", "dp_hs_phy_irq";

Signature · 1 line

2.41.0

Konrad Dybcio

Reviewed-by on v1 4/5

2023-12-13 18:59 UTC #8 lore raw

Re: [PATCH 4/5] arm64: dts: qcom: sm8150: fix USB DP/DM HS PHY interrupts

Quoted 10 lines · Johan Hovold

The USB DP/DM HS PHY interrupts need to be provided by the PDC interrupt controller in order to be able to wake the system up from low-power states and to be able to detect disconnect events, which requires triggering on falling edges.
A recent commit updated the trigger type but failed to change the interrupt provider as required. This leads to the current Linux driver failing to probe instead of printing an error during suspend and USB wakeup not working as intended.

Quoted 8 lines

Fixes 54524b6987d1 ("arm64: dts: qcom: sm8150: fix USB wakeup interrupt types")
Fixes 0c9dde0d2015 ("arm64: dts: qcom: sm8150: Add secondary USB and PHY nodes")
Fixes b33d2868e8d3 ("arm64: dts: qcom: sm8150: Add USB and PHY device nodes")
Cc [email protected] # 5.10
Cc Jack Pham <[email protected]>
Cc Jonathan Marek <[email protected]>
Signed-off-by Johan Hovold <[email protected]>
---

Matches ds

Konrad

Johan Hovold

author

2023-12-13 17:34 UTC #9 lore raw

PATCH 5/5 arm64: dts: qcom: sm8150: fix USB SS wakeup

The USB SS PHY interrupts need to be provided by the PDC interrupt controller in order to be able to wake the system up from low-power states.

Fixes 0c9dde0d2015 ("arm64: dts: qcom: sm8150: Add secondary USB and PHY nodes")

Fixes b33d2868e8d3 ("arm64: dts: qcom: sm8150: Add USB and PHY device nodes")

Cc [email protected] # 5.10

Cc Jack Pham <[email protected]>

Cc Jonathan Marek <[email protected]>

---
 arch/arm64/boot/dts/qcom/sm8150.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/arm64/boot/dts/qcom/sm8150.dtsi +2 -2

index 5e46b9ef8642..56c74a841d80 100644
@@ -3566,7 +3566,7 @@ usb_1: usb@a6f8800 {
 			assigned-clock-rates = <19200000>, <200000000>;
 
 			interrupts-extended = <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
-					      <&intc GIC_SPI 486 IRQ_TYPE_LEVEL_HIGH>,
+					      <&pdc 6 IRQ_TYPE_LEVEL_HIGH>,
 					      <&pdc 8 IRQ_TYPE_EDGE_BOTH>,
 					      <&pdc 9 IRQ_TYPE_EDGE_BOTH>;
 			interrupt-names = "hs_phy_irq", "ss_phy_irq",

@@ -3619,7 +3619,7 @@ usb_2: usb@a8f8800 {
 			assigned-clock-rates = <19200000>, <200000000>;
 
 			interrupts-extended = <&intc GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>,
-					      <&intc GIC_SPI 487 IRQ_TYPE_LEVEL_HIGH>,
+					      <&pdc 7 IRQ_TYPE_LEVEL_HIGH>,
 					      <&pdc 10 IRQ_TYPE_EDGE_BOTH>,
 					      <&pdc 11 IRQ_TYPE_EDGE_BOTH>;
 			interrupt-names = "hs_phy_irq", "ss_phy_irq",

Signature · 1 line

2.41.0

Konrad Dybcio

Reviewed-by on v1 5/5

2023-12-13 19:00 UTC #10 lore raw

Re: [PATCH 5/5] arm64: dts: qcom: sm8150: fix USB SS wakeup

Quoted 11 lines · Johan Hovold

The USB SS PHY interrupts need to be provided by the PDC interrupt controller in order to be able to wake the system up from low-power states.
Fixes 0c9dde0d2015 ("arm64: dts: qcom: sm8150: Add secondary USB and PHY nodes")
Fixes b33d2868e8d3 ("arm64: dts: qcom: sm8150: Add USB and PHY device nodes")
Cc [email protected] # 5.10
Cc Jack Pham <[email protected]>
Cc Jonathan Marek <[email protected]>
Signed-off-by Johan Hovold <[email protected]>
---

Matches ds

Konrad

Konrad Dybcio

2023-12-13 18:49 UTC #11 lore raw

Quoted 13 lines · Johan Hovold

The USB DP/DM HS PHY interrupts need to be provided by the PDC interrupt controller in order to be able to wake the system up from low-power states and to be able to detect disconnect events, which requires triggering on falling edges.
A recent commit updated the trigger type but failed to change the interrupt provider as required. This leads to the current Linux driver failing to probe instead of printing an error during suspend and USB wakeup not working as intended.
While at it, fix also the SS PHY interrupt so that it too can be used to wakeup the system up.

Quoted 8 lines

Thanks to Konrad for reporting the probe failure on sc8180x and providing the corresponding PDC interrupts and to Krishna for providing the remaining PDC interrupts. The exception is for the second controller on sm8150 whose PDC vectors I inferred from sdm845.
Note sdm670 and sm6375 need similar fixes and I believe Bjorn is trying to dig out the corresponding vectors. The SS PHY interrupt on sc8180x should also be fixed.

sdm670:

pdc 9 DP
pdc 8 DM
pdc 6 usb3

Konrad

Krishna Kurapati PSSNV

2023-12-14 01:56 UTC #12 lore raw

Quoted 21 lines · Konrad Dybcio

Quoted 18 lines · Johan Hovold
The USB DP/DM HS PHY interrupts need to be provided by the PDC interrupt controller in order to be able to wake the system up from low-power states and to be able to detect disconnect events, which requires triggering on falling edges.
A recent commit updated the trigger type but failed to change the interrupt provider as required. This leads to the current Linux driver failing to probe instead of printing an error during suspend and USB wakeup not working as intended.
While at it, fix also the SS PHY interrupt so that it too can be used to wakeup the system up.
Thanks to Konrad for reporting the probe failure on sc8180x and providing the corresponding PDC interrupts and to Krishna for providing the remaining PDC interrupts. The exception is for the second controller on sm8150 whose PDC vectors I inferred from sdm845.

Quoted 9 lines

Quoted 3 lines
Note sdm670 and sm6375 need similar fixes and I believe Bjorn is trying to dig out the corresponding vectors. The SS PHY interrupt on sc8180x should also be fixed.
sdm670:
pdc 9 DP
pdc 8 DM
pdc 6 usb3

And for second controller of sdm670/sdm845,

pdc 11 DP
pdc 10 DM
pdc 7 SS

Regards,
Krishna,

Johan Hovold

2023-12-14 07:47 UTC #13 lore raw

Quoted 12 lines · Krishna Kurapati PSSNV

Quoted 11 lines · Konrad Dybcio
Quoted 3 lines · Johan Hovold
Note sdm670 and sm6375 need similar fixes and I believe Bjorn is trying to dig out the corresponding vectors. The SS PHY interrupt on sc8180x should also be fixed.
sdm670:
pdc 9 DP
pdc 8 DM
pdc 6 usb3

Quoted 5 lines

And for second controller of sdm670/sdm845,
pdc 11 DP
pdc 10 DM
pdc 7 SS

Thanks! Looks like we only describe the first controller on sdm670 currently.

I just sent a follow-on series for sdm670 and the sc8180x SS PHY interrupts here:

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

Note that I inferred (guessed) the SS PHY numbers based on sdm670/sdm845/sm8150 which all appear to use the same configuration.

After that series, only sm6375 remains to be fixed.

Johan

Bjorn Andersson

maintainer Applied

2023-12-17 17:21 UTC #14 lore raw