| Message ID | 20231208105155.36097-1-krzysztof.kozlowski@linaro.org |
|---|---|
| State | Accepted |
| Commit | 4791c44c0a982051713458cf4e66855e9f092713 |
| Headers | show |
| Series | [v3,1/4] dt-bindings: PCI: qcom: adjust iommu-map for different SoC | expand |
On 8.12.2023 11:51, Krzysztof Kozlowski wrote: > PCI node in Qualcomm SC8180x DTS has 8 clocks: > > sc8180x-primus.dtb: pci@1c00000: 'oneOf' conditional failed, one must be fixed: > ['pipe', 'aux', 'cfg', 'bus_master', 'bus_slave', 'slave_q2a', 'ref', 'tbu'] is too short > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > > --- [...] > + items: > + - const: pipe # PIPE clock > + - const: aux # Auxiliary clock > + - const: cfg # Configuration clock > + - const: bus_master # Master AXI clock > + - const: bus_slave # Slave AXI clock > + - const: slave_q2a # Slave Q2A clock > + - const: ref # REFERENCE clock > + - const: tbu # PCIe TBU clock Are we sure this one is actually necessary? Or is it just for the SMMU debug peripheral? [1] Would be nice to test if it works normally (unused clk shutdown / forced shutdown of this one might be necessary in case it's on from XBL) and during a PCIe-related SMMU fault. Konrad [1] https://lore.kernel.org/linux-arm-msm/20231118042730.2799-1-quic_c_gdjako@quicinc.com/
On 09/12/2023 18:38, Konrad Dybcio wrote: > On 8.12.2023 11:51, Krzysztof Kozlowski wrote: >> PCI node in Qualcomm SC8180x DTS has 8 clocks: >> >> sc8180x-primus.dtb: pci@1c00000: 'oneOf' conditional failed, one must be fixed: >> ['pipe', 'aux', 'cfg', 'bus_master', 'bus_slave', 'slave_q2a', 'ref', 'tbu'] is too short >> >> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> >> >> --- > [...] > >> + items: >> + - const: pipe # PIPE clock >> + - const: aux # Auxiliary clock >> + - const: cfg # Configuration clock >> + - const: bus_master # Master AXI clock >> + - const: bus_slave # Slave AXI clock >> + - const: slave_q2a # Slave Q2A clock >> + - const: ref # REFERENCE clock >> + - const: tbu # PCIe TBU clock > Are we sure this one is actually necessary? Or is it just for the > SMMU debug peripheral? [1] Would be nice to test if it works > normally (unused clk shutdown / forced shutdown of this one might > be necessary in case it's on from XBL) and during a PCIe-related > SMMU fault. I did not validate whether the list is actually correct with datasheets, but aligned it to DTS. I don't have the hardware to test. Best regards, Krzysztof
On 12/11/23 11:04, Krzysztof Kozlowski wrote: > On 09/12/2023 18:38, Konrad Dybcio wrote: >> On 8.12.2023 11:51, Krzysztof Kozlowski wrote: >>> PCI node in Qualcomm SC8180x DTS has 8 clocks: >>> >>> sc8180x-primus.dtb: pci@1c00000: 'oneOf' conditional failed, one must be fixed: >>> ['pipe', 'aux', 'cfg', 'bus_master', 'bus_slave', 'slave_q2a', 'ref', 'tbu'] is too short >>> >>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> >>> >>> --- >> [...] >> >>> + items: >>> + - const: pipe # PIPE clock >>> + - const: aux # Auxiliary clock >>> + - const: cfg # Configuration clock >>> + - const: bus_master # Master AXI clock >>> + - const: bus_slave # Slave AXI clock >>> + - const: slave_q2a # Slave Q2A clock >>> + - const: ref # REFERENCE clock >>> + - const: tbu # PCIe TBU clock >> Are we sure this one is actually necessary? Or is it just for the >> SMMU debug peripheral? [1] Would be nice to test if it works >> normally (unused clk shutdown / forced shutdown of this one might >> be necessary in case it's on from XBL) and during a PCIe-related >> SMMU fault. > > I did not validate whether the list is actually correct with datasheets, > but aligned it to DTS. I don't have the hardware to test. While I can't test suspend yet, the PCIe itself works fine without these clocks. Mani, can we get rid of it? Konrad
Hello,
Applied to dt-bindings, thank you!
[01/04] dt-bindings: PCI: qcom: Adjust iommu-map for different SoC
https://git.kernel.org/pci/pci/c/4791c44c0a98
[02/04] dt-bindings: PCI: qcom: Correct clocks for SC8180x
https://git.kernel.org/pci/pci/c/f2ab5a2455d9
[03/04] dt-bindings: PCI: qcom: Correct clocks for SM8150
https://git.kernel.org/pci/pci/c/a711253d5f70
The above will go through the PCI tree.
Krzysztof
diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml index 9dbc07dfd48f..5056da499f04 100644 --- a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml +++ b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml @@ -66,7 +66,8 @@ properties: maxItems: 8 iommu-map: - maxItems: 2 + minItems: 1 + maxItems: 16 # Common definitions for clocks, clock-names and reset. # Platform constraints are described later.
The PCIe controller on SDX55 has five entries in its iommu-map, MSM8998 has one and SDM845 has sixteen, so allow wider number of items to fix dtbs_check warnings like: qcom-sdx55-mtp.dtb: pcie@1c00000: iommu-map: [[0, 21, 512, 1], [256, 21, 513, 1], [512, 21, 514, 1], [768, 21, 515, 1], [1024, 21, 516, 1]] is too long Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Acked-by: Conor Dooley <conor.dooley@microchip.com> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- Please take the patch via PCI tree. Changes in v3: 1. None Changes in v2: 1. Add Acs/Rb. --- Documentation/devicetree/bindings/pci/qcom,pcie.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)