Skip to contentSkip to conversation

arm64: dts: qcom: x1e80100: fix missing PCIe PHY clocks

PATCH Applied Johan Hovold 7 participants 11 messages Sep 16, 2024 – Oct 17, 2024

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

cover arm64: dts: qcom: x1e80100: fix missing PCIe PHY clocks

Add the missing clkref enable and pipediv2 clocks to the x1e80100 PCIe PHYs as needed for functional PCIe (e.g. without relying on boot firmware to have left these on).

Johan

Johan Hovold (3):
dt-bindings: phy: qcom,sc8280xp-qmp-pcie-phy: add missing x1e80100
pipediv2 clocks
arm64: dts: qcom: x1e80100: fix PCIe4 and PCIe6a PHY clocks
arm64: dts: qcom: x1e80100: fix PCIe5 PHY clocks

 .../phy/qcom,sc8280xp-qmp-pcie-phy.yaml       |  4 ++--
 arch/arm64/boot/dts/qcom/x1e80100.dtsi        | 24 ++++++++++++-------
 2 files changed, 17 insertions(+), 11 deletions(-)
Signature · 1 line
2.44.2
#1 lore raw

PATCH 1/3 dt-bindings: phy: qcom,sc8280xp-qmp-pcie-phy: add missing x1e80100 pipediv2 clocks

The x1e80100 QMP PCIe PHYs all have a pipediv2 clock that needs to be described.

Fixes e94b29f2bd73 ("dt-bindings: phy: qcom,sc8280xp-qmp-pcie-phy: Document the X1E80100 QMP PCIe PHYs")
Cc Abel Vesa <[email protected]>
---
 .../devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml +2 -2
index dcf4fa55fbba..447b379aa83d 100644
@@ -154,8 +154,6 @@ allOf:
               - qcom,sm8550-qmp-gen4x2-pcie-phy
               - qcom,sm8650-qmp-gen3x2-pcie-phy
               - qcom,sm8650-qmp-gen4x2-pcie-phy
-              - qcom,x1e80100-qmp-gen3x2-pcie-phy
-              - qcom,x1e80100-qmp-gen4x2-pcie-phy
     then:
       properties:
         clocks:
@@ -171,6 +169,8 @@ allOf:
               - qcom,sc8280xp-qmp-gen3x1-pcie-phy
               - qcom,sc8280xp-qmp-gen3x2-pcie-phy
               - qcom,sc8280xp-qmp-gen3x4-pcie-phy
+              - qcom,x1e80100-qmp-gen3x2-pcie-phy
+              - qcom,x1e80100-qmp-gen4x2-pcie-phy
               - qcom,x1e80100-qmp-gen4x4-pcie-phy
     then:
       properties:
Signature · 1 line
2.44.2
maintainer Acked-by on v1 1/3
#2 lore raw

Re: [PATCH 1/3] dt-bindings: phy: qcom,sc8280xp-qmp-pcie-phy: add missing x1e80100 pipediv2 clocks

Quoted 10 lines · Johan Hovold

The x1e80100 QMP PCIe PHYs all have a pipediv2 clock that needs to be described.

Fixes e94b29f2bd73 ("dt-bindings: phy: qcom,sc8280xp-qmp-pcie-phy: Document the X1E80100 QMP PCIe PHYs")
Cc Abel Vesa <[email protected]>
---
 .../devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
#3 lore raw

Re: [PATCH 1/3] dt-bindings: phy: qcom,sc8280xp-qmp-pcie-phy: add missing x1e80100 pipediv2 clocks

In reply to Johan Hovold

Hi Vinod,

Quoted 6 lines · Johan Hovold

The x1e80100 QMP PCIe PHYs all have a pipediv2 clock that needs to be described.

Fixes e94b29f2bd73 ("dt-bindings: phy: qcom,sc8280xp-qmp-pcie-phy: Document the X1E80100 QMP PCIe PHYs")
Cc Abel Vesa <[email protected]>

Bjorn has now picked up the DT fixes for 6.12, but we need this binding change too to avoid checker warnings.

Could you pick this one up for 6.12-rc?

Johan

#4 lore raw

PATCH 2/3 arm64: dts: qcom: x1e80100: fix PCIe4 and PCIe6a PHY clocks

In reply to Johan Hovold

Add the missing clkref enable and pipediv2 clocks to the PCIe4 and PCIe6a PHYs.

Fixes 5eb83fc10289 ("arm64: dts: qcom: x1e80100: Add PCIe nodes")
Cc Abel Vesa <[email protected]>
---
 arch/arm64/boot/dts/qcom/x1e80100.dtsi | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
arch/arm64/boot/dts/qcom/x1e80100.dtsi +10 -6
index 0cf4f3c12428..53e7d1e603cb 100644
@@ -2980,14 +2980,16 @@ pcie6a_phy: phy@1bfc000 {
 
 			clocks = <&gcc GCC_PCIE_6A_PHY_AUX_CLK>,
 				 <&gcc GCC_PCIE_6A_CFG_AHB_CLK>,
-				 <&rpmhcc RPMH_CXO_CLK>,
+				 <&tcsr TCSR_PCIE_4L_CLKREF_EN>,
 				 <&gcc GCC_PCIE_6A_PHY_RCHNG_CLK>,
-				 <&gcc GCC_PCIE_6A_PIPE_CLK>;
+				 <&gcc GCC_PCIE_6A_PIPE_CLK>,
+				 <&gcc GCC_PCIE_6A_PIPEDIV2_CLK>;
 			clock-names = "aux",
 				      "cfg_ahb",
 				      "ref",
 				      "rchng",
-				      "pipe";
+				      "pipe",
+				      "pipediv2";
 
 			resets = <&gcc GCC_PCIE_6A_PHY_BCR>,
 				 <&gcc GCC_PCIE_6A_NOCSR_COM_PHY_BCR>;
@@ -3232,14 +3234,16 @@ pcie4_phy: phy@1c0e000 {
 
 			clocks = <&gcc GCC_PCIE_4_AUX_CLK>,
 				 <&gcc GCC_PCIE_4_CFG_AHB_CLK>,
-				 <&rpmhcc RPMH_CXO_CLK>,
+				 <&tcsr TCSR_PCIE_2L_4_CLKREF_EN>,
 				 <&gcc GCC_PCIE_4_PHY_RCHNG_CLK>,
-				 <&gcc GCC_PCIE_4_PIPE_CLK>;
+				 <&gcc GCC_PCIE_4_PIPE_CLK>,
+				 <&gcc GCC_PCIE_4_PIPEDIV2_CLK>;
 			clock-names = "aux",
 				      "cfg_ahb",
 				      "ref",
 				      "rchng",
-				      "pipe";
+				      "pipe",
+				      "pipediv2";
 
 			resets = <&gcc GCC_PCIE_4_PHY_BCR>;
 			reset-names = "phy";
Signature · 1 line
2.44.2
Reviewed-by on v1 2/3
#5 lore raw

Re: [PATCH 2/3] arm64: dts: qcom: x1e80100: fix PCIe4 and PCIe6a PHY clocks

Quoted 7 lines · Johan Hovold

Add the missing clkref enable and pipediv2 clocks to the PCIe4 and PCIe6a PHYs.

Fixes 5eb83fc10289 ("arm64: dts: qcom: x1e80100: Add PCIe nodes")
Cc Abel Vesa <[email protected]>
Quoted 51 lines
---
 arch/arm64/boot/dts/qcom/x1e80100.dtsi | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
arch/arm64/boot/dts/qcom/x1e80100.dtsi +10 -6
index 0cf4f3c12428..53e7d1e603cb 100644
@@ -2980,14 +2980,16 @@ pcie6a_phy: phy@1bfc000 {
 
 			clocks = <&gcc GCC_PCIE_6A_PHY_AUX_CLK>,
 				 <&gcc GCC_PCIE_6A_CFG_AHB_CLK>,
-				 <&rpmhcc RPMH_CXO_CLK>,
+				 <&tcsr TCSR_PCIE_4L_CLKREF_EN>,
 				 <&gcc GCC_PCIE_6A_PHY_RCHNG_CLK>,
-				 <&gcc GCC_PCIE_6A_PIPE_CLK>;
+				 <&gcc GCC_PCIE_6A_PIPE_CLK>,
+				 <&gcc GCC_PCIE_6A_PIPEDIV2_CLK>;
 			clock-names = "aux",
 				      "cfg_ahb",
 				      "ref",
 				      "rchng",
-				      "pipe";
+				      "pipe",
+				      "pipediv2";
 
 			resets = <&gcc GCC_PCIE_6A_PHY_BCR>,
 				 <&gcc GCC_PCIE_6A_NOCSR_COM_PHY_BCR>;
@@ -3232,14 +3234,16 @@ pcie4_phy: phy@1c0e000 {
 
 			clocks = <&gcc GCC_PCIE_4_AUX_CLK>,
 				 <&gcc GCC_PCIE_4_CFG_AHB_CLK>,
-				 <&rpmhcc RPMH_CXO_CLK>,
+				 <&tcsr TCSR_PCIE_2L_4_CLKREF_EN>,
 				 <&gcc GCC_PCIE_4_PHY_RCHNG_CLK>,
-				 <&gcc GCC_PCIE_4_PIPE_CLK>;
+				 <&gcc GCC_PCIE_4_PIPE_CLK>,
+				 <&gcc GCC_PCIE_4_PIPEDIV2_CLK>;
 			clock-names = "aux",
 				      "cfg_ahb",
 				      "ref",
 				      "rchng",
-				      "pipe";
+				      "pipe",
+				      "pipediv2";
 
 			resets = <&gcc GCC_PCIE_4_PHY_BCR>;
 			reset-names = "phy";
Signature · 1 line
2.44.2
maintainer Reviewed-by on v1 2/3
#6 lore raw

Re: [PATCH 2/3] arm64: dts: qcom: x1e80100: fix PCIe4 and PCIe6a PHY clocks

In reply to Johan Hovold
Quoted 8 lines · Johan Hovold

Add the missing clkref enable and pipediv2 clocks to the PCIe4 and PCIe6a PHYs.

Fixes 5eb83fc10289 ("arm64: dts: qcom: x1e80100: Add PCIe nodes")
Cc Abel Vesa <[email protected]>

---

I reckon you split it like you day so that it's easier to backport..

Konrad

#7 lore raw

PATCH 3/3 arm64: dts: qcom: x1e80100: fix PCIe5 PHY clocks

In reply to Johan Hovold

Add the missing clkref enable and pipediv2 clocks to the PCIe5 PHY.

Fixes 62ab23e15508 ("arm64: dts: qcom: x1e80100: add PCIe5 nodes")
---
 arch/arm64/boot/dts/qcom/x1e80100.dtsi | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/qcom/x1e80100.dtsi +5 -3
index 53e7d1e603cb..d1bb14a375c3 100644
@@ -3104,14 +3104,16 @@ pcie5_phy: phy@1c06000 {
 
 			clocks = <&gcc GCC_PCIE_5_AUX_CLK>,
 				 <&gcc GCC_PCIE_5_CFG_AHB_CLK>,
-				 <&rpmhcc RPMH_CXO_CLK>,
+				 <&tcsr TCSR_PCIE_2L_5_CLKREF_EN>,
 				 <&gcc GCC_PCIE_5_PHY_RCHNG_CLK>,
-				 <&gcc GCC_PCIE_5_PIPE_CLK>;
+				 <&gcc GCC_PCIE_5_PIPE_CLK>,
+				 <&gcc GCC_PCIE_5_PIPEDIV2_CLK>;
 			clock-names = "aux",
 				      "cfg_ahb",
 				      "ref",
 				      "rchng",
-				      "pipe";
+				      "pipe",
+				      "pipediv2";
 
 			resets = <&gcc GCC_PCIE_5_PHY_BCR>;
 			reset-names = "phy";
Signature · 1 line
2.44.2
maintainer Applied
#9 lore raw

Re: (subset) [PATCH 0/3] arm64: dts: qcom: x1e80100: fix missing PCIe PHY clocks

In reply to Johan Hovold
Quoted 8 lines · Johan Hovold

Add the missing clkref enable and pipediv2 clocks to the x1e80100 PCIe PHYs as needed for functional PCIe (e.g. without relying on boot firmware to have left these on).

Johan

[...]

Applied, thanks!

[2/3] arm64: dts: qcom: x1e80100: fix PCIe4 and PCIe6a PHY clocks

      commit: 27727cb6604e0998d03d9ec063b517b239d2bb0f
[3/3] arm64: dts: qcom: x1e80100: fix PCIe5 PHY clocks
      commit: 0b80b3c0f6d20f1bc1f7fea6176a8df15619e884

Best regards,

Signature · 1 line
Bjorn Andersson <[email protected]>
maintainer Applied
#10 lore raw

Re: (subset) [PATCH 0/3] arm64: dts: qcom: x1e80100: fix missing PCIe PHY clocks

In reply to Johan Hovold
Quoted 8 lines · Johan Hovold

Add the missing clkref enable and pipediv2 clocks to the x1e80100 PCIe PHYs as needed for functional PCIe (e.g. without relying on boot firmware to have left these on).

Johan

[...]

Applied, thanks!

[1/3] dt-bindings: phy: qcom,sc8280xp-qmp-pcie-phy: add missing x1e80100 pipediv2 clocks

      commit: 938ade15abaea765dfab32d906de45657067c11f

Best regards,

Signature · 1 line
~Vinod