Skip to contentSkip to conversation

dt-bindings: PCI: qcom: Allow 'vddpe-3v3-supply' again

PATCH Applied Johan Hovold 6 participants 15 messages Jul 23, 2024 – Sep 11, 2024

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

PATCH 1/1 dt-bindings: PCI: qcom: Allow 'vddpe-3v3-supply' again

Commit 756485bfbb85 ("dt-bindings: PCI: qcom,pcie-sc7280: Move SC7280 to dedicated schema") incorrectly removed 'vddpe-3v3-supply' from the bindings, which results in DT checker warnings like:

arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone-dora.dtb: pcie@600000: Unevaluated properties are not allowed ('vddpe-3v3-supply' was unexpected) from schema $id: http://devicetree.org/schemas/pci/qcom,pcie.yaml#

Note that this property has been part of the Qualcomm PCIe bindings since 2018 and would need to be deprecated rather than simply removed if there is a desire to replace it with 'vpcie3v3' which is used for some non-Qualcomm controllers.

Fixes 756485bfbb85 ("dt-bindings: PCI: qcom,pcie-sc7280: Move SC7280 to dedicated schema")
---
 Documentation/devicetree/bindings/pci/qcom,pcie-common.yaml   | 3 +++
 Documentation/devicetree/bindings/pci/qcom,pcie-sc7280.yaml   | 3 ---
 Documentation/devicetree/bindings/pci/qcom,pcie-sc8280xp.yaml | 3 ---
 Documentation/devicetree/bindings/pci/qcom,pcie.yaml          | 3 +++
 4 files changed, 6 insertions(+), 6 deletions(-)
Documentation/devicetree/bindings/pci/qcom,pcie-common.yaml +3 -0
index 0a39bbfcb28b..2b6f5a171f20 100644
@@ -78,6 +78,9 @@ properties:
     description: GPIO controlled connection to WAKE# signal
     maxItems: 1
 
+  vddpe-3v3-supply:
+    description: PCIe endpoint power supply
+
 required:
   - reg
   - reg-names
Documentation/devicetree/bindings/pci/qcom,pcie-sc7280.yaml +0 -3
index 634da24ec3ed..7ed46a929d73 100644
@@ -66,9 +66,6 @@ properties:
     items:
       - const: pci
 
-  vddpe-3v3-supply:
-    description: PCIe endpoint power supply
-
 allOf:
   - $ref: qcom,pcie-common.yaml#
 
Documentation/devicetree/bindings/pci/qcom,pcie-sc8280xp.yaml +0 -3
index 25c9f13ae977..15ba2385eb73 100644
@@ -58,9 +58,6 @@ properties:
     items:
       - const: pci
 
-  vddpe-3v3-supply:
-    description: A phandle to the PCIe endpoint power supply
-
 required:
   - interconnects
   - interconnect-names
Documentation/devicetree/bindings/pci/qcom,pcie.yaml +3 -0
index f867746b1ae5..ffabbac57fc1 100644
@@ -91,6 +91,9 @@ properties:
   vdda_refclk-supply:
     description: A phandle to the core analog power supply for IC which generates reference clock
 
+  vddpe-3v3-supply:
+    description: A phandle to the PCIe endpoint power supply
+
   phys:
     maxItems: 1
 
Signature · 1 line
2.44.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Johan Hovold

Commit 756485bfbb85 ("dt-bindings: PCI: qcom,pcie-sc7280: Move SC7280 to dedicated schema") incorrectly removed 'vddpe-3v3-supply' from the bindings, which results in DT checker warnings like:

arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone-dora.dtb: pcie@600000: Unevaluated properties are not allowed ('vddpe-3v3-supply' was unexpected) from schema $id: http://devicetree.org/schemas/pci/qcom,pcie.yaml#

Quoted 7 lines

Note that this property has been part of the Qualcomm PCIe bindings since 2018 and would need to be deprecated rather than simply removed if there is a desire to replace it with 'vpcie3v3' which is used for some non-Qualcomm controllers.

Fixes 756485bfbb85 ("dt-bindings: PCI: qcom,pcie-sc7280: Move SC7280 to dedicated schema")

Thanks. You could also mention in commit msg that Linux drivers for msm8996, SM8[123456]50 and few others actually requested that supply. In any case:

Best regards,
Krzysztof

#2 lore raw
In reply to Johan Hovold
Quoted 11 lines · Johan Hovold

Commit 756485bfbb85 ("dt-bindings: PCI: qcom,pcie-sc7280: Move SC7280 to dedicated schema") incorrectly removed 'vddpe-3v3-supply' from the bindings, which results in DT checker warnings like:

arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone-dora.dtb: pcie@600000: Unevaluated properties are not allowed ('vddpe-3v3-supply' was unexpected) from schema $id: http://devicetree.org/schemas/pci/qcom,pcie.yaml#

Note that this property has been part of the Qualcomm PCIe bindings since 2018 and would need to be deprecated rather than simply removed if there is a desire to replace it with 'vpcie3v3' which is used for some non-Qualcomm controllers.

I think Rob Herring suggested [1] adding the property to the root port node rather than the host. If that suggestion still applies it might be better to enable the deprecated propertly only for the hosts, which already used it, and to define a new property at the root port.

[1] https://lore.kernel.org/lkml/[email protected]/

Quoted 9 lines
Fixes 756485bfbb85 ("dt-bindings: PCI: qcom,pcie-sc7280: Move SC7280 to dedicated schema")
---
 Documentation/devicetree/bindings/pci/qcom,pcie-common.yaml   | 3 +++
 Documentation/devicetree/bindings/pci/qcom,pcie-sc7280.yaml   | 3 ---
 Documentation/devicetree/bindings/pci/qcom,pcie-sc8280xp.yaml | 3 ---
 Documentation/devicetree/bindings/pci/qcom,pcie.yaml          | 3 +++
 4 files changed, 6 insertions(+), 6 deletions(-)
Signature · 2 lines
With best wishes
Dmitry
#3 lore raw
Quoted 13 lines · Dmitry Baryshkov
Quoted 11 lines · Johan Hovold

Commit 756485bfbb85 ("dt-bindings: PCI: qcom,pcie-sc7280: Move SC7280 to dedicated schema") incorrectly removed 'vddpe-3v3-supply' from the bindings, which results in DT checker warnings like:

arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone-dora.dtb: pcie@600000: Unevaluated properties are not allowed ('vddpe-3v3-supply' was unexpected) from schema $id: http://devicetree.org/schemas/pci/qcom,pcie.yaml#

Note that this property has been part of the Qualcomm PCIe bindings since 2018 and would need to be deprecated rather than simply removed if there is a desire to replace it with 'vpcie3v3' which is used for some non-Qualcomm controllers.

Quoted 4 lines

I think Rob Herring suggested [1] adding the property to the root port node rather than the host. If that suggestion still applies it might be better to enable the deprecated propertly only for the hosts, which already used it, and to define a new property at the root port.

You seem to miss the point that this is just restoring status quo (and that the property has not yet been deprecated).

I assume you've already read my reply to Rob's bot, but here it is for reference for others:

Johan

#4 lore raw
Quoted 15 lines · Johan Hovold
Quoted 13 lines · Dmitry Baryshkov
Quoted 11 lines · Johan Hovold

Commit 756485bfbb85 ("dt-bindings: PCI: qcom,pcie-sc7280: Move SC7280 to dedicated schema") incorrectly removed 'vddpe-3v3-supply' from the bindings, which results in DT checker warnings like:

arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone-dora.dtb: pcie@600000: Unevaluated properties are not allowed ('vddpe-3v3-supply' was unexpected)
from schema $id: http://devicetree.org/schemas/pci/qcom,pcie.yaml#

Note that this property has been part of the Qualcomm PCIe bindings since 2018 and would need to be deprecated rather than simply removed if there is a desire to replace it with 'vpcie3v3' which is used for some non-Qualcomm controllers.

Quoted 7 lines
Quoted 4 lines

I think Rob Herring suggested [1] adding the property to the root port node rather than the host. If that suggestion still applies it might be better to enable the deprecated propertly only for the hosts, which already used it, and to define a new property at the root port.

You seem to miss the point that this is just restoring status quo (and that the property has not yet been deprecated).

You are restoring it for all platforms. However in my opinion it's better to follow Rob's suggestion and to add new property to the device where it actually belongs, rather than hacking up the PCIe host device. More importantly with the arrival of the power sequencing subsystem we can handle powering up PCIe devices properly.

Quoted 6 lines

I assume you've already read my reply to Rob's bot, but here it is for reference for others:

Johan

Signature · 2 lines
With best wishes
Dmitry
#5 lore raw
Quoted 14 lines · Dmitry Baryshkov
Quoted 13 lines · Johan Hovold
Quoted 11 lines · Dmitry Baryshkov
Quoted 4 lines · Johan Hovold

Note that this property has been part of the Qualcomm PCIe bindings since 2018 and would need to be deprecated rather than simply removed if there is a desire to replace it with 'vpcie3v3' which is used for some non-Qualcomm controllers.

I think Rob Herring suggested [1] adding the property to the root port node rather than the host. If that suggestion still applies it might be better to enable the deprecated propertly only for the hosts, which already used it, and to define a new property at the root port.

Quoted 4 lines
Quoted 2 lines

You seem to miss the point that this is just restoring status quo (and that the property has not yet been deprecated).

You are restoring it for all platforms.

It is already part of the bindings for all platforms.

Johan

#6 lore raw
Quoted 15 lines · Johan Hovold
Quoted 14 lines · Dmitry Baryshkov
Quoted 13 lines · Johan Hovold
Quoted 11 lines · Dmitry Baryshkov
Quoted 4 lines · Johan Hovold

Note that this property has been part of the Qualcomm PCIe bindings since 2018 and would need to be deprecated rather than simply removed if there is a desire to replace it with 'vpcie3v3' which is used for some non-Qualcomm controllers.

I think Rob Herring suggested [1] adding the property to the root port node rather than the host. If that suggestion still applies it might be better to enable the deprecated propertly only for the hosts, which already used it, and to define a new property at the root port.

Quoted 6 lines
Quoted 4 lines
Quoted 2 lines

You seem to miss the point that this is just restoring status quo (and that the property has not yet been deprecated).

You are restoring it for all platforms.

It is already part of the bindings for all platforms.

It is not, it is enabled only for sc7280 and sc8280xp. It has been, before the mentioned patch. I propopse to enable the property for the platforms which are using it now (that is +x1e80100, msm8996 and sdm845), clearly document it as deprecated and start shifting to the pwrseq and having the power supplies being a part of the root port or wcn device, depending on the use case.

Signature · 2 lines
With best wishes
Dmitry
#7 lore raw
Quoted 5 lines · Dmitry Baryshkov
Quoted 1 line · Johan Hovold

It is already part of the bindings for all platforms.

It is not, it is enabled only for sc7280 and sc8280xp.

No, that's both incorrect and irrelevant. It is used by msm8996 and older platforms by in-kernel DTs as well. But the point is that is has been part of the bindings an cannot simply be removed as there can be out-of-tree DTs that are correctly using this property for any of these platforms.

Johan

#8 lore raw
Quoted 5 lines · Johan Hovold
Quoted 4 lines · Dmitry Baryshkov
Quoted 1 line · Johan Hovold

It is already part of the bindings for all platforms.

Quoted 7 lines
Quoted 1 line

It is not, it is enabled only for sc7280 and sc8280xp.

No, that's both incorrect and irrelevant. It is used by msm8996 and older platforms by in-kernel DTs as well. But the point is that is has been part of the bindings an cannot simply be removed as there can be out-of-tree DTs that are correctly using this property for any of these platforms.

It can not be removed from the driver, but it definitely can be remove from bindings.

Signature · 2 lines
With best wishes
Dmitry
#9 lore raw
Quoted 8 lines · Dmitry Baryshkov
Quoted 7 lines · Johan Hovold
Quoted 5 lines · Dmitry Baryshkov
Quoted 1 line · Johan Hovold

It is already part of the bindings for all platforms.

It is not, it is enabled only for sc7280 and sc8280xp.

Quoted 8 lines
Quoted 5 lines

No, that's both incorrect and irrelevant. It is used by msm8996 and older platforms by in-kernel DTs as well. But the point is that is has been part of the bindings an cannot simply be removed as there can be out-of-tree DTs that are correctly using this property for any of these platforms.

It can not be removed from the driver, but it definitely can be remove from bindings.

You apparently ignored the word "simply" in "cannot simply be removed".

Johan

#10 lore raw
In reply to Johan Hovold
Quoted 7 lines · Johan Hovold

Commit 756485bfbb85 ("dt-bindings: PCI: qcom,pcie-sc7280: Move SC7280 to dedicated schema") incorrectly removed 'vddpe-3v3-supply' from the bindings, which results in DT checker warnings like:

arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone-dora.dtb: pcie@600000: Unevaluated properties are not allowed ('vddpe-3v3-supply' was unexpected) from schema $id: http://devicetree.org/schemas/pci/qcom,pcie.yaml#

Quoted 7 lines

Note that this property has been part of the Qualcomm PCIe bindings since 2018 and would need to be deprecated rather than simply removed if there is a desire to replace it with 'vpcie3v3' which is used for some non-Qualcomm controllers.

Fixes 756485bfbb85 ("dt-bindings: PCI: qcom,pcie-sc7280: Move SC7280 to dedicated schema")

Can someone pick this one up for 6.11?

Johan

#11 lore raw
Quoted 13 lines · Johan Hovold
Quoted 12 lines · Johan Hovold

Commit 756485bfbb85 ("dt-bindings: PCI: qcom,pcie-sc7280: Move SC7280 to dedicated schema") incorrectly removed 'vddpe-3v3-supply' from the bindings, which results in DT checker warnings like:

arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone-dora.dtb: pcie@600000: Unevaluated properties are not allowed ('vddpe-3v3-supply' was unexpected) from schema $id: http://devicetree.org/schemas/pci/qcom,pcie.yaml#

Note that this property has been part of the Qualcomm PCIe bindings since 2018 and would need to be deprecated rather than simply removed if there is a desire to replace it with 'vpcie3v3' which is used for some non-Qualcomm controllers.

Quoted 4 lines
Quoted 2 lines
Fixes 756485bfbb85 ("dt-bindings: PCI: qcom,pcie-sc7280: Move SC7280 to dedicated schema")

Can someone pick this one up for 6.11?

Another three weeks have passed and the merge window is now around the corner.

Can someone please pick this one up for 6.12.

Note that this patch has been acked by the driver maintainer as well as a DT maintainer.

Johan

#12 lore raw
In reply to Johan Hovold
Quoted 13 lines · Johan Hovold
Quoted 12 lines · Johan Hovold

Commit 756485bfbb85 ("dt-bindings: PCI: qcom,pcie-sc7280: Move SC7280 to dedicated schema") incorrectly removed 'vddpe-3v3-supply' from the bindings, which results in DT checker warnings like:

arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone-dora.dtb: pcie@600000: Unevaluated properties are not allowed ('vddpe-3v3-supply' was unexpected) from schema $id: http://devicetree.org/schemas/pci/qcom,pcie.yaml#

Note that this property has been part of the Qualcomm PCIe bindings since 2018 and would need to be deprecated rather than simply removed if there is a desire to replace it with 'vpcie3v3' which is used for some non-Qualcomm controllers.

Quoted 4 lines
Quoted 2 lines
Fixes 756485bfbb85 ("dt-bindings: PCI: qcom,pcie-sc7280: Move SC7280 to dedicated schema")

Can someone pick this one up for 6.11?

I applied this to pci/dt-bindings for v6.12.

v6.11 is possible but we'd need a bit of a story to justify it. 756485bfbb85 appeared in v6.9, and the commit log says it fixes a DT checker warning, which don't make it sound like this is urgent. Is there more to it that would make this v6.11 material?

Bjorn

#13 lore raw
Quoted 17 lines · Bjorn Helgaas
Quoted 16 lines · Johan Hovold
Quoted 14 lines · Johan Hovold

Commit 756485bfbb85 ("dt-bindings: PCI: qcom,pcie-sc7280: Move SC7280 to dedicated schema") incorrectly removed 'vddpe-3v3-supply' from the bindings, which results in DT checker warnings like:

arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone-dora.dtb: pcie@600000: Unevaluated properties are not allowed ('vddpe-3v3-supply' was unexpected) from schema $id: http://devicetree.org/schemas/pci/qcom,pcie.yaml#

Note that this property has been part of the Qualcomm PCIe bindings since 2018 and would need to be deprecated rather than simply removed if there is a desire to replace it with 'vpcie3v3' which is used for some non-Qualcomm controllers.

Fixes 756485bfbb85 ("dt-bindings: PCI: qcom,pcie-sc7280: Move SC7280 to dedicated schema")
Quoted 8 lines
Quoted 1 line

Can someone pick this one up for 6.11?

I applied this to pci/dt-bindings for v6.12.

v6.11 is possible but we'd need a bit of a story to justify it. 756485bfbb85 appeared in v6.9, and the commit log says it fixes a DT checker warning, which don't make it sound like this is urgent. Is there more to it that would make this v6.11 material?

No, merging for 6.12 is fine (e.g. this late in the cycle). Thanks.

Johan

Reviewed-by on v1 1/1
#14 lore raw
In reply to Johan Hovold
Quoted 7 lines · Johan Hovold

Commit 756485bfbb85 ("dt-bindings: PCI: qcom,pcie-sc7280: Move SC7280 to dedicated schema") incorrectly removed 'vddpe-3v3-supply' from the bindings, which results in DT checker warnings like:

arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone-dora.dtb: pcie@600000: Unevaluated properties are not allowed ('vddpe-3v3-supply' was unexpected) from schema $id: http://devicetree.org/schemas/pci/qcom,pcie.yaml#

Quoted 7 lines

Note that this property has been part of the Qualcomm PCIe bindings since 2018 and would need to be deprecated rather than simply removed if there is a desire to replace it with 'vpcie3v3' which is used for some non-Qualcomm controllers.

Fixes 756485bfbb85 ("dt-bindings: PCI: qcom,pcie-sc7280: Move SC7280 to dedicated schema")

- Mani

Quoted 66 lines
---
 Documentation/devicetree/bindings/pci/qcom,pcie-common.yaml   | 3 +++
 Documentation/devicetree/bindings/pci/qcom,pcie-sc7280.yaml   | 3 ---
 Documentation/devicetree/bindings/pci/qcom,pcie-sc8280xp.yaml | 3 ---
 Documentation/devicetree/bindings/pci/qcom,pcie.yaml          | 3 +++
 4 files changed, 6 insertions(+), 6 deletions(-)
Documentation/devicetree/bindings/pci/qcom,pcie-common.yaml +3 -0
index 0a39bbfcb28b..2b6f5a171f20 100644
@@ -78,6 +78,9 @@ properties:
     description: GPIO controlled connection to WAKE# signal
     maxItems: 1
 
+  vddpe-3v3-supply:
+    description: PCIe endpoint power supply
+
 required:
   - reg
   - reg-names
Documentation/devicetree/bindings/pci/qcom,pcie-sc7280.yaml +0 -3
index 634da24ec3ed..7ed46a929d73 100644
@@ -66,9 +66,6 @@ properties:
     items:
       - const: pci
 
-  vddpe-3v3-supply:
-    description: PCIe endpoint power supply
-
 allOf:
   - $ref: qcom,pcie-common.yaml#
 
Documentation/devicetree/bindings/pci/qcom,pcie-sc8280xp.yaml +0 -3
index 25c9f13ae977..15ba2385eb73 100644
@@ -58,9 +58,6 @@ properties:
     items:
       - const: pci
 
-  vddpe-3v3-supply:
-    description: A phandle to the PCIe endpoint power supply
-
 required:
   - interconnects
   - interconnect-names
Documentation/devicetree/bindings/pci/qcom,pcie.yaml +3 -0
index f867746b1ae5..ffabbac57fc1 100644
@@ -91,6 +91,9 @@ properties:
   vdda_refclk-supply:
     description: A phandle to the core analog power supply for IC which generates reference clock
 
+  vddpe-3v3-supply:
+    description: A phandle to the PCIe endpoint power supply
+
   phys:
     maxItems: 1
 
Signature · 1 line
2.44.2
Signature · 1 line
மணிவண்ணன் சதாசிவம்