* [PATCH v3 0/2] convert designware-pcie.txt and kirin-pcie.txt to yaml @ 2021-07-09 13:57 Mauro Carvalho Chehab 2021-07-09 13:57 ` [PATCH v3 1/2] dt-bindings: PCI: designware-pcie.txt: convert it " Mauro Carvalho Chehab 2021-07-09 13:57 ` [PATCH v3 2/2] dt-bindings: PCI: kirin-pcie.txt: " Mauro Carvalho Chehab 0 siblings, 2 replies; 6+ messages in thread From: Mauro Carvalho Chehab @ 2021-07-09 13:57 UTC (permalink / raw) To: Rob Herring Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, devicetree, linux-amlogic, linux-arm-kernel, linux-arm-kernel, linux-arm-msm, linux-kernel, linux-omap, linux-pci, linux-riscv, linux-samsung-soc, linux-tegra Hi Rob, This series applies after this one: https://lore.kernel.org/lkml/cover.1625826353.git.mchehab+huawei@kernel.org/ It basically converts two PCI DT-bindings to DT schema. On this version, I'm addressing some of your comments from v2, and rebased it on the top of my Hikey 960/970 tree (based on linus/master). The example for the designware file is producing some warnings here, as it can't find the right propertiesPattern. No idea why. Mauro Carvalho Chehab (2): dt-bindings: PCI: designware-pcie.txt: convert it to yaml dt-bindings: PCI: kirin-pcie.txt: convert it to yaml .../bindings/pci/amlogic,meson-pcie.txt | 4 +- .../bindings/pci/axis,artpec6-pcie.txt | 2 +- .../bindings/pci/designware-pcie.txt | 77 ---------- .../bindings/pci/fsl,imx6q-pcie.txt | 2 +- .../bindings/pci/hisilicon,kirin-pcie.yaml | 79 ++++++++++ .../bindings/pci/hisilicon-histb-pcie.txt | 2 +- .../devicetree/bindings/pci/kirin-pcie.txt | 41 ------ .../bindings/pci/layerscape-pci.txt | 2 +- .../bindings/pci/nvidia,tegra194-pcie.txt | 4 +- .../devicetree/bindings/pci/pci-armada8k.txt | 2 +- .../devicetree/bindings/pci/pcie-al.txt | 2 +- .../devicetree/bindings/pci/qcom,pcie.txt | 14 +- .../bindings/pci/samsung,exynos-pcie.yaml | 2 +- .../bindings/pci/sifive,fu740-pcie.yaml | 2 +- .../devicetree/bindings/pci/snps,dw-pcie.yaml | 135 ++++++++++++++++++ .../pci/socionext,uniphier-pcie-ep.yaml | 2 +- .../devicetree/bindings/pci/ti-pci.txt | 4 +- .../devicetree/bindings/pci/uniphier-pcie.txt | 2 +- MAINTAINERS | 4 +- 19 files changed, 239 insertions(+), 143 deletions(-) delete mode 100644 Documentation/devicetree/bindings/pci/designware-pcie.txt create mode 100644 Documentation/devicetree/bindings/pci/hisilicon,kirin-pcie.yaml delete mode 100644 Documentation/devicetree/bindings/pci/kirin-pcie.txt create mode 100644 Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml -- 2.31.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3 1/2] dt-bindings: PCI: designware-pcie.txt: convert it to yaml 2021-07-09 13:57 [PATCH v3 0/2] convert designware-pcie.txt and kirin-pcie.txt to yaml Mauro Carvalho Chehab @ 2021-07-09 13:57 ` Mauro Carvalho Chehab 2021-07-12 14:12 ` Rob Herring 2021-07-12 17:45 ` Rob Herring 2021-07-09 13:57 ` [PATCH v3 2/2] dt-bindings: PCI: kirin-pcie.txt: " Mauro Carvalho Chehab 1 sibling, 2 replies; 6+ messages in thread From: Mauro Carvalho Chehab @ 2021-07-09 13:57 UTC (permalink / raw) To: Rob Herring Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Andy Gross, Bjorn Andersson, Bjorn Helgaas, Fabio Estevam, Greentime Hu, Gustavo Pimentel, Jaehoon Chung, Jerome Brunet, Jesper Nilsson, Jingoo Han, Jonathan Chocron, Jonathan Hunter, Kevin Hilman, Kishon Vijay Abraham I, Krzysztof Kozlowski, Kunihiko Hayashi, Lucas Stach, Marek Szyprowski, Martin Blumenstingl, Masami Hiramatsu, NXP Linux Team, Neil Armstrong, Palmer Dabbelt, Paul Walmsley, Pengutronix Kernel Team, Richard Zhu, Rob Herring, Sascha Hauer, Shawn Guo, Thierry Reding, Thomas Petazzoni, devicetree, linux-amlogic, linux-arm-kernel, linux-arm-kernel, linux-arm-msm, linux-kernel, linux-omap, linux-pci, linux-riscv, linux-samsung-soc, linux-tegra Convert the file to DT schema. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../bindings/pci/amlogic,meson-pcie.txt | 4 +- .../bindings/pci/axis,artpec6-pcie.txt | 2 +- .../bindings/pci/designware-pcie.txt | 77 ---------- .../bindings/pci/fsl,imx6q-pcie.txt | 2 +- .../bindings/pci/hisilicon-histb-pcie.txt | 2 +- .../devicetree/bindings/pci/kirin-pcie.txt | 2 +- .../bindings/pci/layerscape-pci.txt | 2 +- .../bindings/pci/nvidia,tegra194-pcie.txt | 4 +- .../devicetree/bindings/pci/pci-armada8k.txt | 2 +- .../devicetree/bindings/pci/pcie-al.txt | 2 +- .../devicetree/bindings/pci/qcom,pcie.txt | 14 +- .../bindings/pci/samsung,exynos-pcie.yaml | 2 +- .../bindings/pci/sifive,fu740-pcie.yaml | 2 +- .../devicetree/bindings/pci/snps,dw-pcie.yaml | 135 ++++++++++++++++++ .../pci/socionext,uniphier-pcie-ep.yaml | 2 +- .../devicetree/bindings/pci/ti-pci.txt | 4 +- .../devicetree/bindings/pci/uniphier-pcie.txt | 2 +- MAINTAINERS | 2 +- 18 files changed, 160 insertions(+), 102 deletions(-) delete mode 100644 Documentation/devicetree/bindings/pci/designware-pcie.txt create mode 100644 Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml diff --git a/Documentation/devicetree/bindings/pci/amlogic,meson-pcie.txt b/Documentation/devicetree/bindings/pci/amlogic,meson-pcie.txt index b6acbe694ffb..c3a75ac6e59d 100644 --- a/Documentation/devicetree/bindings/pci/amlogic,meson-pcie.txt +++ b/Documentation/devicetree/bindings/pci/amlogic,meson-pcie.txt @@ -3,7 +3,7 @@ Amlogic Meson AXG DWC PCIE SoC controller Amlogic Meson PCIe host controller is based on the Synopsys DesignWare PCI core. It shares common functions with the PCIe DesignWare core driver and inherits common properties defined in -Documentation/devicetree/bindings/pci/designware-pcie.txt. +Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml. Additional properties are described here: @@ -33,7 +33,7 @@ Required properties: - phy-names: must contain "pcie" - device_type: - should be "pci". As specified in designware-pcie.txt + should be "pci". As specified in snps,dw-pcie.yaml Example configuration: diff --git a/Documentation/devicetree/bindings/pci/axis,artpec6-pcie.txt b/Documentation/devicetree/bindings/pci/axis,artpec6-pcie.txt index 979dc7b6cfe8..cc6dcdb676b9 100644 --- a/Documentation/devicetree/bindings/pci/axis,artpec6-pcie.txt +++ b/Documentation/devicetree/bindings/pci/axis,artpec6-pcie.txt @@ -1,7 +1,7 @@ * Axis ARTPEC-6 PCIe interface This PCIe host controller is based on the Synopsys DesignWare PCIe IP -and thus inherits all the common properties defined in designware-pcie.txt. +and thus inherits all the common properties defined in snps,dw-pcie.yaml. Required properties: - compatible: "axis,artpec6-pcie", "snps,dw-pcie" for ARTPEC-6 in RC mode; diff --git a/Documentation/devicetree/bindings/pci/designware-pcie.txt b/Documentation/devicetree/bindings/pci/designware-pcie.txt deleted file mode 100644 index 78494c4050f7..000000000000 --- a/Documentation/devicetree/bindings/pci/designware-pcie.txt +++ /dev/null @@ -1,77 +0,0 @@ -* Synopsys DesignWare PCIe interface - -Required properties: -- compatible: - "snps,dw-pcie" for RC mode; - "snps,dw-pcie-ep" for EP mode; -- reg: For designware cores version < 4.80 contains the configuration - address space. For designware core version >= 4.80, contains - the configuration and ATU address space -- reg-names: Must be "config" for the PCIe configuration space and "atu" for - the ATU address space. - (The old way of getting the configuration address space from "ranges" - is deprecated and should be avoided.) -RC mode: -- #address-cells: set to <3> -- #size-cells: set to <2> -- device_type: set to "pci" -- ranges: ranges for the PCI memory and I/O regions -- #interrupt-cells: set to <1> -- interrupt-map-mask and interrupt-map: standard PCI - properties to define the mapping of the PCIe interface to interrupt - numbers. -EP mode: -- num-ib-windows: number of inbound address translation windows -- num-ob-windows: number of outbound address translation windows - -Optional properties: -- num-lanes: number of lanes to use (this property should be specified unless - the link is brought already up in BIOS) -- reset-gpio: GPIO pin number of power good signal -- clocks: Must contain an entry for each entry in clock-names. - See ../clocks/clock-bindings.txt for details. -- clock-names: Must include the following entries: - - "pcie" - - "pcie_bus" -- snps,enable-cdm-check: This is a boolean property and if present enables - automatic checking of CDM (Configuration Dependent Module) registers - for data corruption. CDM registers include standard PCIe configuration - space registers, Port Logic registers, DMA and iATU (internal Address - Translation Unit) registers. -RC mode: -- num-viewport: number of view ports configured in hardware. If a platform - does not specify it, the driver assumes 2. -- bus-range: PCI bus numbers covered (it is recommended for new devicetrees - to specify this property, to keep backwards compatibility a range of - 0x00-0xff is assumed if not present) - -EP mode: -- max-functions: maximum number of functions that can be configured - -Example configuration: - - pcie: pcie@dfc00000 { - compatible = "snps,dw-pcie"; - reg = <0xdfc00000 0x0001000>, /* IP registers */ - <0xd0000000 0x0002000>; /* Configuration space */ - reg-names = "dbi", "config"; - #address-cells = <3>; - #size-cells = <2>; - device_type = "pci"; - ranges = <0x81000000 0 0x00000000 0xde000000 0 0x00010000 - 0x82000000 0 0xd0400000 0xd0400000 0 0x0d000000>; - interrupts = <25>, <24>; - #interrupt-cells = <1>; - num-lanes = <1>; - }; -or - pcie: pcie@dfc00000 { - compatible = "snps,dw-pcie-ep"; - reg = <0xdfc00000 0x0001000>, /* IP registers 1 */ - <0xdfc01000 0x0001000>, /* IP registers 2 */ - <0xd0000000 0x2000000>; /* Configuration space */ - reg-names = "dbi", "dbi2", "addr_space"; - num-ib-windows = <6>; - num-ob-windows = <2>; - num-lanes = <1>; - }; diff --git a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt index de4b2baf91e8..5cee38ce711b 100644 --- a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt +++ b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt @@ -1,7 +1,7 @@ * Freescale i.MX6 PCIe interface This PCIe host controller is based on the Synopsys DesignWare PCIe IP -and thus inherits all the common properties defined in designware-pcie.txt. +and thus inherits all the common properties defined in snps,dw-pcie.yaml. Required properties: - compatible: diff --git a/Documentation/devicetree/bindings/pci/hisilicon-histb-pcie.txt b/Documentation/devicetree/bindings/pci/hisilicon-histb-pcie.txt index 760b4d740616..5f0cf6c2fef3 100644 --- a/Documentation/devicetree/bindings/pci/hisilicon-histb-pcie.txt +++ b/Documentation/devicetree/bindings/pci/hisilicon-histb-pcie.txt @@ -3,7 +3,7 @@ HiSilicon STB PCIe host bridge DT description The HiSilicon STB PCIe host controller is based on the DesignWare PCIe core. It shares common functions with the DesignWare PCIe core driver and inherits common properties defined in -Documentation/devicetree/bindings/pci/designware-pcie.txt. +Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml. Additional properties are described here: diff --git a/Documentation/devicetree/bindings/pci/kirin-pcie.txt b/Documentation/devicetree/bindings/pci/kirin-pcie.txt index 585aadfeafd1..3a36eeb1c434 100644 --- a/Documentation/devicetree/bindings/pci/kirin-pcie.txt +++ b/Documentation/devicetree/bindings/pci/kirin-pcie.txt @@ -3,7 +3,7 @@ HiSilicon Kirin SoCs PCIe host DT description Kirin PCIe host controller is based on the Synopsys DesignWare PCI core. It shares common functions with the PCIe DesignWare core driver and inherits common properties defined in -Documentation/devicetree/bindings/pci/designware-pcie.txt. +Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml. Additional properties are described here: diff --git a/Documentation/devicetree/bindings/pci/layerscape-pci.txt b/Documentation/devicetree/bindings/pci/layerscape-pci.txt index 6d898dd4a8e2..f36efa73a470 100644 --- a/Documentation/devicetree/bindings/pci/layerscape-pci.txt +++ b/Documentation/devicetree/bindings/pci/layerscape-pci.txt @@ -1,7 +1,7 @@ Freescale Layerscape PCIe controller This PCIe host controller is based on the Synopsys DesignWare PCIe IP -and thus inherits all the common properties defined in designware-pcie.txt. +and thus inherits all the common properties defined in snps,dw-pcie.yaml. This controller derives its clocks from the Reset Configuration Word (RCW) which is used to describe the PLL settings at the time of chip-reset. diff --git a/Documentation/devicetree/bindings/pci/nvidia,tegra194-pcie.txt b/Documentation/devicetree/bindings/pci/nvidia,tegra194-pcie.txt index bd43f3c3ece4..498a7b3bd2a6 100644 --- a/Documentation/devicetree/bindings/pci/nvidia,tegra194-pcie.txt +++ b/Documentation/devicetree/bindings/pci/nvidia,tegra194-pcie.txt @@ -1,7 +1,7 @@ NVIDIA Tegra PCIe controller (Synopsys DesignWare Core based) This PCIe controller is based on the Synopsis Designware PCIe IP -and thus inherits all the common properties defined in designware-pcie.txt. +and thus inherits all the common properties defined in snps,dw-pcie.yaml. Some of the controller instances are dual mode where in they can work either in root port mode or endpoint mode but one at a time. @@ -22,7 +22,7 @@ Required properties: property. - reg-names: Must include the following entries: "appl": Controller's application logic registers - "config": As per the definition in designware-pcie.txt + "config": As per the definition in snps,dw-pcie.yaml "atu_dma": iATU and DMA registers. This is where the iATU (internal Address Translation Unit) registers of the PCIe core are made available for SW access. diff --git a/Documentation/devicetree/bindings/pci/pci-armada8k.txt b/Documentation/devicetree/bindings/pci/pci-armada8k.txt index 7a813d0e6d63..ff25a134befa 100644 --- a/Documentation/devicetree/bindings/pci/pci-armada8k.txt +++ b/Documentation/devicetree/bindings/pci/pci-armada8k.txt @@ -1,7 +1,7 @@ * Marvell Armada 7K/8K PCIe interface This PCIe host controller is based on the Synopsys DesignWare PCIe IP -and thus inherits all the common properties defined in designware-pcie.txt. +and thus inherits all the common properties defined in snps,dw-pcie.yaml. Required properties: - compatible: "marvell,armada8k-pcie" diff --git a/Documentation/devicetree/bindings/pci/pcie-al.txt b/Documentation/devicetree/bindings/pci/pcie-al.txt index 557a5089229d..2ad1fe466eab 100644 --- a/Documentation/devicetree/bindings/pci/pcie-al.txt +++ b/Documentation/devicetree/bindings/pci/pcie-al.txt @@ -2,7 +2,7 @@ Amazon's Annapurna Labs PCIe Host Controller is based on the Synopsys DesignWare PCI core. It inherits common properties defined in -Documentation/devicetree/bindings/pci/designware-pcie.txt. +Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml. Properties of the host controller node that differ from it are: diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.txt b/Documentation/devicetree/bindings/pci/qcom,pcie.txt index 0da458a051b6..1226b19b8c3d 100644 --- a/Documentation/devicetree/bindings/pci/qcom,pcie.txt +++ b/Documentation/devicetree/bindings/pci/qcom,pcie.txt @@ -33,22 +33,22 @@ - device_type: Usage: required Value type: <string> - Definition: Should be "pci". As specified in designware-pcie.txt + Definition: Should be "pci". As specified in snps,dw-pcie.yaml - #address-cells: Usage: required Value type: <u32> - Definition: Should be 3. As specified in designware-pcie.txt + Definition: Should be 3. As specified in snps,dw-pcie.yaml - #size-cells: Usage: required Value type: <u32> - Definition: Should be 2. As specified in designware-pcie.txt + Definition: Should be 2. As specified in snps,dw-pcie.yaml - ranges: Usage: required Value type: <prop-encoded-array> - Definition: As specified in designware-pcie.txt + Definition: As specified in snps,dw-pcie.yaml - interrupts: Usage: required @@ -63,17 +63,17 @@ - #interrupt-cells: Usage: required Value type: <u32> - Definition: Should be 1. As specified in designware-pcie.txt + Definition: Should be 1. As specified in snps,dw-pcie.yaml - interrupt-map-mask: Usage: required Value type: <prop-encoded-array> - Definition: As specified in designware-pcie.txt + Definition: As specified in snps,dw-pcie.yaml - interrupt-map: Usage: required Value type: <prop-encoded-array> - Definition: As specified in designware-pcie.txt + Definition: As specified in snps,dw-pcie.yaml - clocks: Usage: required diff --git a/Documentation/devicetree/bindings/pci/samsung,exynos-pcie.yaml b/Documentation/devicetree/bindings/pci/samsung,exynos-pcie.yaml index 1810bf722350..3f49c8017c7a 100644 --- a/Documentation/devicetree/bindings/pci/samsung,exynos-pcie.yaml +++ b/Documentation/devicetree/bindings/pci/samsung,exynos-pcie.yaml @@ -13,7 +13,7 @@ maintainers: description: |+ Exynos5433 SoC PCIe host controller is based on the Synopsys DesignWare PCIe IP and thus inherits all the common properties defined in - designware-pcie.txt. + snps,dw-pcie.yaml. allOf: - $ref: /schemas/pci/pci-bus.yaml# diff --git a/Documentation/devicetree/bindings/pci/sifive,fu740-pcie.yaml b/Documentation/devicetree/bindings/pci/sifive,fu740-pcie.yaml index b03cbb9b6602..0cc1998a9d46 100644 --- a/Documentation/devicetree/bindings/pci/sifive,fu740-pcie.yaml +++ b/Documentation/devicetree/bindings/pci/sifive,fu740-pcie.yaml @@ -10,7 +10,7 @@ description: |+ SiFive FU740 PCIe host controller is based on the Synopsys DesignWare PCI core. It shares common features with the PCIe DesignWare core and inherits common properties defined in - Documentation/devicetree/bindings/pci/designware-pcie.txt. + Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml. maintainers: - Paul Walmsley <paul.walmsley@sifive.com> diff --git a/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml b/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml new file mode 100644 index 000000000000..de463338b6ed --- /dev/null +++ b/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml @@ -0,0 +1,135 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/pci/snps,dw-pcie.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Synopsys DesignWare PCIe interface + +maintainers: + - Jingoo Han <jingoohan1@gmail.com> + - Gustavo Pimentel <gustavo.pimentel@synopsys.com> + +description: | + Synopsys DesignWare PCIe host controller + +properties: + compatible: + anyOf: + - {} + - items: + contains: + enum: + - snps,dw-pcie + - snps,dw-pcie-ep + + reg: + description: | + It should contain Data Bus Interface (dbi, dbi2) registers for all + versions. + For designware cores version < 4.80, contains the configuration + address space. For designware core version >= 4.80, + contains the configuration and ATU address space. + minItems: 2 + maxItems: 4 + + reg-names: + minItems: 2 + maxItems: 4 + items: + contains: + enum: [dbi, dbi2, config, atu, addr_space] + + num-lanes: + $ref: '/schemas/types.yaml#/definitions/uint32' + description: | + number of lanes to use (this property should be specified unless + the link is brought already up in BIOS) + maxItems: 1 + + reset-gpio: + description: GPIO pin number of PERST# signal + maxItems: 1 + + "snps,enable-cdm-check": + type: boolean + description: | + This is a boolean property and if present enables + automatic checking of CDM (Configuration Dependent Module) registers + for data corruption. CDM registers include standard PCIe configuration + space registers, Port Logic registers, DMA and iATU (internal Address + Translation Unit) registers. + + num-viewport: + description: | + number of view ports configured in hardware. If a platform + does not specify it, the driver assumes 2. + deprecated: true + + num-ib-windows: + description: number of inbound address translation windows + maxItems: 1 + deprecated: true + + num-ob-windows: + description: number of outbound address translation windows + maxItems: 1 + deprecated: true + + # The following are optional properties for EP mode + + max-functions: + $ref: /schemas/types.yaml#/definitions/uint32 + description: maximum number of functions that can be configured + +required: + - reg + - reg-names + - compatible + +additionalProperties: false + +allOf: + - if: + properties: + compatible: + contains: + const: snps,dw-pcie + then: + allOf: + - $ref: /schemas/pci/pci-bus.yaml# + +patternProperties: + "pcie?_ep@[0-9a-f]+$": + type: object + properties: + compatible: + contains: + const: snps,dw-pcie-ep + + "pcie?@[0-9a-f]+$": + type: object + +examples: + - | + pcie: pcie@dfc00000 { + compatible = "snps,dw-pcie"; + reg = <0xdfc00000 0x0001000>, /* IP registers */ + <0xd0000000 0x0002000>; /* Configuration space */ + reg-names = "dbi", "config"; + #address-cells = <3>; + #size-cells = <2>; + device_type = "pci"; + ranges = <0x81000000 0 0x00000000 0xde000000 0 0x00010000>, + <0x82000000 0 0xd0400000 0xd0400000 0 0x0d000000>; + interrupts = <25>, <24>; + #interrupt-cells = <1>; + num-lanes = <1>; + }; + pcie_ep: pcie_ep@dfd00000 { + compatible = "snps,dw-pcie-ep"; + reg = <0xdfc00000 0x0001000>, /* IP registers 1 */ + <0xdfc01000 0x0001000>, /* IP registers 2 */ + <0xd0000000 0x2000000>; /* Configuration space */ + reg-names = "dbi", "dbi2", "addr_space"; + }; diff --git a/Documentation/devicetree/bindings/pci/socionext,uniphier-pcie-ep.yaml b/Documentation/devicetree/bindings/pci/socionext,uniphier-pcie-ep.yaml index d6cf8a560ef0..ae8c8f701a56 100644 --- a/Documentation/devicetree/bindings/pci/socionext,uniphier-pcie-ep.yaml +++ b/Documentation/devicetree/bindings/pci/socionext,uniphier-pcie-ep.yaml @@ -10,7 +10,7 @@ description: | UniPhier PCIe endpoint controller is based on the Synopsys DesignWare PCI core. It shares common features with the PCIe DesignWare core and inherits common properties defined in - Documentation/devicetree/bindings/pci/designware-pcie.txt. + Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml. maintainers: - Kunihiko Hayashi <hayashi.kunihiko@socionext.com> diff --git a/Documentation/devicetree/bindings/pci/ti-pci.txt b/Documentation/devicetree/bindings/pci/ti-pci.txt index d5cbfe6b0d89..8147e3e3e29b 100644 --- a/Documentation/devicetree/bindings/pci/ti-pci.txt +++ b/Documentation/devicetree/bindings/pci/ti-pci.txt @@ -12,7 +12,7 @@ PCIe DesignWare Controller number of PHYs as specified in *phys* property. - ti,hwmods : Name of the hwmod associated to the pcie, "pcie<X>", where <X> is the instance number of the pcie from the HW spec. - - num-lanes as specified in ../designware-pcie.txt + - num-lanes as specified in ../snps,dw-pcie.yaml - ti,syscon-lane-sel : phandle/offset pair. Phandle to the system control module and the register offset to specify lane selection. @@ -32,7 +32,7 @@ HOST MODE device_type, ranges, interrupt-map-mask, - interrupt-map : as specified in ../designware-pcie.txt + interrupt-map : as specified in ../snps,dw-pcie.yaml - ti,syscon-unaligned-access: phandle to the syscon DT node. The 1st argument should contain the register offset within syscon and the 2nd argument should contain the bit field diff --git a/Documentation/devicetree/bindings/pci/uniphier-pcie.txt b/Documentation/devicetree/bindings/pci/uniphier-pcie.txt index c4b7381733a0..359585db049f 100644 --- a/Documentation/devicetree/bindings/pci/uniphier-pcie.txt +++ b/Documentation/devicetree/bindings/pci/uniphier-pcie.txt @@ -6,7 +6,7 @@ on Socionext UniPhier SoCs. UniPhier PCIe host controller is based on the Synopsys DesignWare PCI core. It shares common functions with the PCIe DesignWare core driver and inherits common properties defined in -Documentation/devicetree/bindings/pci/designware-pcie.txt. +Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml. Required properties: - compatible: Should be "socionext,uniphier-pcie". diff --git a/MAINTAINERS b/MAINTAINERS index a334dc13ec96..55ca4cac17b0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14231,7 +14231,7 @@ M: Jingoo Han <jingoohan1@gmail.com> M: Gustavo Pimentel <gustavo.pimentel@synopsys.com> L: linux-pci@vger.kernel.org S: Maintained -F: Documentation/devicetree/bindings/pci/designware-pcie.txt +F: Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml F: drivers/pci/controller/dwc/*designware* PCI DRIVER FOR TI DRA7XX/J721E -- 2.31.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v3 1/2] dt-bindings: PCI: designware-pcie.txt: convert it to yaml 2021-07-09 13:57 ` [PATCH v3 1/2] dt-bindings: PCI: designware-pcie.txt: convert it " Mauro Carvalho Chehab @ 2021-07-12 14:12 ` Rob Herring 2021-07-12 17:45 ` Rob Herring 1 sibling, 0 replies; 6+ messages in thread From: Rob Herring @ 2021-07-12 14:12 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: Marek Szyprowski, NXP Linux Team, Jaehoon Chung, Neil Armstrong, mauro.chehab, linux-arm-msm, Sascha Hauer, Masami Hiramatsu, linuxarm, linux-arm-kernel, devicetree, Thomas Petazzoni, Kunihiko Hayashi, Thierry Reding, linux-kernel, Lucas Stach, Fabio Estevam, Gustavo Pimentel, Jerome Brunet, Kishon Vijay Abraham I, Kevin Hilman, Pengutronix Kernel Team, linux-arm-kernel, Jonathan Chocron, linux-pci, linux-tegra, linux-amlogic, Richard Zhu, Bjorn Helgaas, Martin Blumenstingl, linux-omap, Jingoo Han, Palmer Dabbelt, Krzysztof Kozlowski, Rob Herring, linux-samsung-soc, Jonathan Hunter, Bjorn Andersson, Jesper Nilsson, Andy Gross, Greentime Hu, Paul Walmsley, linux-riscv, Shawn Guo On Fri, 09 Jul 2021 15:57:42 +0200, Mauro Carvalho Chehab wrote: > Convert the file to DT schema. > > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > --- > .../bindings/pci/amlogic,meson-pcie.txt | 4 +- > .../bindings/pci/axis,artpec6-pcie.txt | 2 +- > .../bindings/pci/designware-pcie.txt | 77 ---------- > .../bindings/pci/fsl,imx6q-pcie.txt | 2 +- > .../bindings/pci/hisilicon-histb-pcie.txt | 2 +- > .../devicetree/bindings/pci/kirin-pcie.txt | 2 +- > .../bindings/pci/layerscape-pci.txt | 2 +- > .../bindings/pci/nvidia,tegra194-pcie.txt | 4 +- > .../devicetree/bindings/pci/pci-armada8k.txt | 2 +- > .../devicetree/bindings/pci/pcie-al.txt | 2 +- > .../devicetree/bindings/pci/qcom,pcie.txt | 14 +- > .../bindings/pci/samsung,exynos-pcie.yaml | 2 +- > .../bindings/pci/sifive,fu740-pcie.yaml | 2 +- > .../devicetree/bindings/pci/snps,dw-pcie.yaml | 135 ++++++++++++++++++ > .../pci/socionext,uniphier-pcie-ep.yaml | 2 +- > .../devicetree/bindings/pci/ti-pci.txt | 4 +- > .../devicetree/bindings/pci/uniphier-pcie.txt | 2 +- > MAINTAINERS | 2 +- > 18 files changed, 160 insertions(+), 102 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/pci/designware-pcie.txt > create mode 100644 Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13): yamllint warnings/errors: dtschema/dtc warnings/errors: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/pci/intel-gw-pcie.example.dt.yaml: pcie@d0e00000: '#address-cells', '#interrupt-cells', '#size-cells', 'bus-range', 'clocks', 'device_type', 'interrupt-map', 'interrupt-map-mask', 'linux,pci-domain', 'max-link-speed', 'phy-names', 'phys', 'ranges', 'reset-assert-ms', 'reset-gpios', 'resets' do not match any of the regexes: 'pcie?@[0-9a-f]+$', 'pcie?_ep@[0-9a-f]+$', 'pinctrl-[0-9]+' From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/pci/snps,dw-pcie.example.dt.yaml: pcie@dfc00000: '#address-cells', '#interrupt-cells', '#size-cells', 'device_type', 'interrupts', 'ranges' do not match any of the regexes: 'pcie?@[0-9a-f]+$', 'pcie?_ep@[0-9a-f]+$', 'pinctrl-[0-9]+' From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml \ndoc reference errors (make refcheckdocs): Documentation/devicetree/bindings/pci/pci-keystone.txt: Documentation/devicetree/bindings/pci/designware-pcie.txt Documentation/devicetree/bindings/pci/pci-keystone.txt: Documentation/devicetree/bindings/pci/designware-pcie.txt Documentation/devicetree/bindings/pci/pci-keystone.txt: Documentation/devicetree/bindings/pci/designware-pcie.txt Documentation/devicetree/bindings/pci/pci-keystone.txt: Documentation/devicetree/bindings/pci/designware-pcie.txt Documentation/devicetree/bindings/pci/pci-keystone.txt: Documentation/devicetree/bindings/pci/designware-pcie.txt MAINTAINERS: Documentation/devicetree/bindings/pci/designware-pcie.txt See https://patchwork.ozlabs.org/patch/1503171 This check can fail if there are any dependencies. The base for a patch series is generally the most recent rc1. If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date: pip3 install dtschema --upgrade Please check and re-submit. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 1/2] dt-bindings: PCI: designware-pcie.txt: convert it to yaml 2021-07-09 13:57 ` [PATCH v3 1/2] dt-bindings: PCI: designware-pcie.txt: convert it " Mauro Carvalho Chehab 2021-07-12 14:12 ` Rob Herring @ 2021-07-12 17:45 ` Rob Herring 2021-07-13 8:31 ` Mauro Carvalho Chehab 1 sibling, 1 reply; 6+ messages in thread From: Rob Herring @ 2021-07-12 17:45 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: linuxarm, mauro.chehab, Andy Gross, Bjorn Andersson, Bjorn Helgaas, Fabio Estevam, Greentime Hu, Gustavo Pimentel, Jaehoon Chung, Jerome Brunet, Jesper Nilsson, Jingoo Han, Jonathan Chocron, Jonathan Hunter, Kevin Hilman, Kishon Vijay Abraham I, Krzysztof Kozlowski, Kunihiko Hayashi, Lucas Stach, Marek Szyprowski, Martin Blumenstingl, Masami Hiramatsu, NXP Linux Team, Neil Armstrong, Palmer Dabbelt, Paul Walmsley, Pengutronix Kernel Team, Richard Zhu, Sascha Hauer, Shawn Guo, Thierry Reding, Thomas Petazzoni, devicetree, linux-amlogic, linux-arm-kernel, linux-arm-kernel, linux-arm-msm, linux-kernel, linux-omap, linux-pci, linux-riscv, linux-samsung-soc, linux-tegra On Fri, Jul 09, 2021 at 03:57:42PM +0200, Mauro Carvalho Chehab wrote: > Convert the file to DT schema. > > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > --- > .../bindings/pci/amlogic,meson-pcie.txt | 4 +- > .../bindings/pci/axis,artpec6-pcie.txt | 2 +- > .../bindings/pci/designware-pcie.txt | 77 ---------- > .../bindings/pci/fsl,imx6q-pcie.txt | 2 +- > .../bindings/pci/hisilicon-histb-pcie.txt | 2 +- > .../devicetree/bindings/pci/kirin-pcie.txt | 2 +- > .../bindings/pci/layerscape-pci.txt | 2 +- > .../bindings/pci/nvidia,tegra194-pcie.txt | 4 +- > .../devicetree/bindings/pci/pci-armada8k.txt | 2 +- > .../devicetree/bindings/pci/pcie-al.txt | 2 +- > .../devicetree/bindings/pci/qcom,pcie.txt | 14 +- > .../bindings/pci/samsung,exynos-pcie.yaml | 2 +- > .../bindings/pci/sifive,fu740-pcie.yaml | 2 +- > .../devicetree/bindings/pci/snps,dw-pcie.yaml | 135 ++++++++++++++++++ > .../pci/socionext,uniphier-pcie-ep.yaml | 2 +- > .../devicetree/bindings/pci/ti-pci.txt | 4 +- > .../devicetree/bindings/pci/uniphier-pcie.txt | 2 +- > MAINTAINERS | 2 +- > 18 files changed, 160 insertions(+), 102 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/pci/designware-pcie.txt > create mode 100644 Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml > > diff --git a/Documentation/devicetree/bindings/pci/amlogic,meson-pcie.txt b/Documentation/devicetree/bindings/pci/amlogic,meson-pcie.txt > index b6acbe694ffb..c3a75ac6e59d 100644 > --- a/Documentation/devicetree/bindings/pci/amlogic,meson-pcie.txt > +++ b/Documentation/devicetree/bindings/pci/amlogic,meson-pcie.txt > @@ -3,7 +3,7 @@ Amlogic Meson AXG DWC PCIE SoC controller > Amlogic Meson PCIe host controller is based on the Synopsys DesignWare PCI core. > It shares common functions with the PCIe DesignWare core driver and > inherits common properties defined in > -Documentation/devicetree/bindings/pci/designware-pcie.txt. > +Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml. > > Additional properties are described here: > > @@ -33,7 +33,7 @@ Required properties: > - phy-names: must contain "pcie" > > - device_type: > - should be "pci". As specified in designware-pcie.txt > + should be "pci". As specified in snps,dw-pcie.yaml > > > Example configuration: > diff --git a/Documentation/devicetree/bindings/pci/axis,artpec6-pcie.txt b/Documentation/devicetree/bindings/pci/axis,artpec6-pcie.txt > index 979dc7b6cfe8..cc6dcdb676b9 100644 > --- a/Documentation/devicetree/bindings/pci/axis,artpec6-pcie.txt > +++ b/Documentation/devicetree/bindings/pci/axis,artpec6-pcie.txt > @@ -1,7 +1,7 @@ > * Axis ARTPEC-6 PCIe interface > > This PCIe host controller is based on the Synopsys DesignWare PCIe IP > -and thus inherits all the common properties defined in designware-pcie.txt. > +and thus inherits all the common properties defined in snps,dw-pcie.yaml. > > Required properties: > - compatible: "axis,artpec6-pcie", "snps,dw-pcie" for ARTPEC-6 in RC mode; > diff --git a/Documentation/devicetree/bindings/pci/designware-pcie.txt b/Documentation/devicetree/bindings/pci/designware-pcie.txt > deleted file mode 100644 > index 78494c4050f7..000000000000 > --- a/Documentation/devicetree/bindings/pci/designware-pcie.txt > +++ /dev/null > @@ -1,77 +0,0 @@ > -* Synopsys DesignWare PCIe interface > - > -Required properties: > -- compatible: > - "snps,dw-pcie" for RC mode; > - "snps,dw-pcie-ep" for EP mode; > -- reg: For designware cores version < 4.80 contains the configuration > - address space. For designware core version >= 4.80, contains > - the configuration and ATU address space > -- reg-names: Must be "config" for the PCIe configuration space and "atu" for > - the ATU address space. > - (The old way of getting the configuration address space from "ranges" > - is deprecated and should be avoided.) > -RC mode: > -- #address-cells: set to <3> > -- #size-cells: set to <2> > -- device_type: set to "pci" > -- ranges: ranges for the PCI memory and I/O regions > -- #interrupt-cells: set to <1> > -- interrupt-map-mask and interrupt-map: standard PCI > - properties to define the mapping of the PCIe interface to interrupt > - numbers. > -EP mode: > -- num-ib-windows: number of inbound address translation windows > -- num-ob-windows: number of outbound address translation windows > - > -Optional properties: > -- num-lanes: number of lanes to use (this property should be specified unless > - the link is brought already up in BIOS) > -- reset-gpio: GPIO pin number of power good signal > -- clocks: Must contain an entry for each entry in clock-names. > - See ../clocks/clock-bindings.txt for details. > -- clock-names: Must include the following entries: > - - "pcie" > - - "pcie_bus" > -- snps,enable-cdm-check: This is a boolean property and if present enables > - automatic checking of CDM (Configuration Dependent Module) registers > - for data corruption. CDM registers include standard PCIe configuration > - space registers, Port Logic registers, DMA and iATU (internal Address > - Translation Unit) registers. > -RC mode: > -- num-viewport: number of view ports configured in hardware. If a platform > - does not specify it, the driver assumes 2. > -- bus-range: PCI bus numbers covered (it is recommended for new devicetrees > - to specify this property, to keep backwards compatibility a range of > - 0x00-0xff is assumed if not present) > - > -EP mode: > -- max-functions: maximum number of functions that can be configured > - > -Example configuration: > - > - pcie: pcie@dfc00000 { > - compatible = "snps,dw-pcie"; > - reg = <0xdfc00000 0x0001000>, /* IP registers */ > - <0xd0000000 0x0002000>; /* Configuration space */ > - reg-names = "dbi", "config"; > - #address-cells = <3>; > - #size-cells = <2>; > - device_type = "pci"; > - ranges = <0x81000000 0 0x00000000 0xde000000 0 0x00010000 > - 0x82000000 0 0xd0400000 0xd0400000 0 0x0d000000>; > - interrupts = <25>, <24>; > - #interrupt-cells = <1>; > - num-lanes = <1>; > - }; > -or > - pcie: pcie@dfc00000 { > - compatible = "snps,dw-pcie-ep"; > - reg = <0xdfc00000 0x0001000>, /* IP registers 1 */ > - <0xdfc01000 0x0001000>, /* IP registers 2 */ > - <0xd0000000 0x2000000>; /* Configuration space */ > - reg-names = "dbi", "dbi2", "addr_space"; > - num-ib-windows = <6>; > - num-ob-windows = <2>; > - num-lanes = <1>; > - }; > diff --git a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt > index de4b2baf91e8..5cee38ce711b 100644 > --- a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt > +++ b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt > @@ -1,7 +1,7 @@ > * Freescale i.MX6 PCIe interface > > This PCIe host controller is based on the Synopsys DesignWare PCIe IP > -and thus inherits all the common properties defined in designware-pcie.txt. > +and thus inherits all the common properties defined in snps,dw-pcie.yaml. > > Required properties: > - compatible: > diff --git a/Documentation/devicetree/bindings/pci/hisilicon-histb-pcie.txt b/Documentation/devicetree/bindings/pci/hisilicon-histb-pcie.txt > index 760b4d740616..5f0cf6c2fef3 100644 > --- a/Documentation/devicetree/bindings/pci/hisilicon-histb-pcie.txt > +++ b/Documentation/devicetree/bindings/pci/hisilicon-histb-pcie.txt > @@ -3,7 +3,7 @@ HiSilicon STB PCIe host bridge DT description > The HiSilicon STB PCIe host controller is based on the DesignWare PCIe core. > It shares common functions with the DesignWare PCIe core driver and inherits > common properties defined in > -Documentation/devicetree/bindings/pci/designware-pcie.txt. > +Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml. > > Additional properties are described here: > > diff --git a/Documentation/devicetree/bindings/pci/kirin-pcie.txt b/Documentation/devicetree/bindings/pci/kirin-pcie.txt > index 585aadfeafd1..3a36eeb1c434 100644 > --- a/Documentation/devicetree/bindings/pci/kirin-pcie.txt > +++ b/Documentation/devicetree/bindings/pci/kirin-pcie.txt > @@ -3,7 +3,7 @@ HiSilicon Kirin SoCs PCIe host DT description > Kirin PCIe host controller is based on the Synopsys DesignWare PCI core. > It shares common functions with the PCIe DesignWare core driver and > inherits common properties defined in > -Documentation/devicetree/bindings/pci/designware-pcie.txt. > +Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml. > > Additional properties are described here: > > diff --git a/Documentation/devicetree/bindings/pci/layerscape-pci.txt b/Documentation/devicetree/bindings/pci/layerscape-pci.txt > index 6d898dd4a8e2..f36efa73a470 100644 > --- a/Documentation/devicetree/bindings/pci/layerscape-pci.txt > +++ b/Documentation/devicetree/bindings/pci/layerscape-pci.txt > @@ -1,7 +1,7 @@ > Freescale Layerscape PCIe controller > > This PCIe host controller is based on the Synopsys DesignWare PCIe IP > -and thus inherits all the common properties defined in designware-pcie.txt. > +and thus inherits all the common properties defined in snps,dw-pcie.yaml. > > This controller derives its clocks from the Reset Configuration Word (RCW) > which is used to describe the PLL settings at the time of chip-reset. > diff --git a/Documentation/devicetree/bindings/pci/nvidia,tegra194-pcie.txt b/Documentation/devicetree/bindings/pci/nvidia,tegra194-pcie.txt > index bd43f3c3ece4..498a7b3bd2a6 100644 > --- a/Documentation/devicetree/bindings/pci/nvidia,tegra194-pcie.txt > +++ b/Documentation/devicetree/bindings/pci/nvidia,tegra194-pcie.txt > @@ -1,7 +1,7 @@ > NVIDIA Tegra PCIe controller (Synopsys DesignWare Core based) > > This PCIe controller is based on the Synopsis Designware PCIe IP > -and thus inherits all the common properties defined in designware-pcie.txt. > +and thus inherits all the common properties defined in snps,dw-pcie.yaml. > Some of the controller instances are dual mode where in they can work either > in root port mode or endpoint mode but one at a time. > > @@ -22,7 +22,7 @@ Required properties: > property. > - reg-names: Must include the following entries: > "appl": Controller's application logic registers > - "config": As per the definition in designware-pcie.txt > + "config": As per the definition in snps,dw-pcie.yaml > "atu_dma": iATU and DMA registers. This is where the iATU (internal Address > Translation Unit) registers of the PCIe core are made available > for SW access. > diff --git a/Documentation/devicetree/bindings/pci/pci-armada8k.txt b/Documentation/devicetree/bindings/pci/pci-armada8k.txt > index 7a813d0e6d63..ff25a134befa 100644 > --- a/Documentation/devicetree/bindings/pci/pci-armada8k.txt > +++ b/Documentation/devicetree/bindings/pci/pci-armada8k.txt > @@ -1,7 +1,7 @@ > * Marvell Armada 7K/8K PCIe interface > > This PCIe host controller is based on the Synopsys DesignWare PCIe IP > -and thus inherits all the common properties defined in designware-pcie.txt. > +and thus inherits all the common properties defined in snps,dw-pcie.yaml. > > Required properties: > - compatible: "marvell,armada8k-pcie" > diff --git a/Documentation/devicetree/bindings/pci/pcie-al.txt b/Documentation/devicetree/bindings/pci/pcie-al.txt > index 557a5089229d..2ad1fe466eab 100644 > --- a/Documentation/devicetree/bindings/pci/pcie-al.txt > +++ b/Documentation/devicetree/bindings/pci/pcie-al.txt > @@ -2,7 +2,7 @@ > > Amazon's Annapurna Labs PCIe Host Controller is based on the Synopsys DesignWare > PCI core. It inherits common properties defined in > -Documentation/devicetree/bindings/pci/designware-pcie.txt. > +Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml. > > Properties of the host controller node that differ from it are: > > diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.txt b/Documentation/devicetree/bindings/pci/qcom,pcie.txt > index 0da458a051b6..1226b19b8c3d 100644 > --- a/Documentation/devicetree/bindings/pci/qcom,pcie.txt > +++ b/Documentation/devicetree/bindings/pci/qcom,pcie.txt > @@ -33,22 +33,22 @@ > - device_type: > Usage: required > Value type: <string> > - Definition: Should be "pci". As specified in designware-pcie.txt > + Definition: Should be "pci". As specified in snps,dw-pcie.yaml > > - #address-cells: > Usage: required > Value type: <u32> > - Definition: Should be 3. As specified in designware-pcie.txt > + Definition: Should be 3. As specified in snps,dw-pcie.yaml > > - #size-cells: > Usage: required > Value type: <u32> > - Definition: Should be 2. As specified in designware-pcie.txt > + Definition: Should be 2. As specified in snps,dw-pcie.yaml > > - ranges: > Usage: required > Value type: <prop-encoded-array> > - Definition: As specified in designware-pcie.txt > + Definition: As specified in snps,dw-pcie.yaml > > - interrupts: > Usage: required > @@ -63,17 +63,17 @@ > - #interrupt-cells: > Usage: required > Value type: <u32> > - Definition: Should be 1. As specified in designware-pcie.txt > + Definition: Should be 1. As specified in snps,dw-pcie.yaml > > - interrupt-map-mask: > Usage: required > Value type: <prop-encoded-array> > - Definition: As specified in designware-pcie.txt > + Definition: As specified in snps,dw-pcie.yaml > > - interrupt-map: > Usage: required > Value type: <prop-encoded-array> > - Definition: As specified in designware-pcie.txt > + Definition: As specified in snps,dw-pcie.yaml > > - clocks: > Usage: required > diff --git a/Documentation/devicetree/bindings/pci/samsung,exynos-pcie.yaml b/Documentation/devicetree/bindings/pci/samsung,exynos-pcie.yaml > index 1810bf722350..3f49c8017c7a 100644 > --- a/Documentation/devicetree/bindings/pci/samsung,exynos-pcie.yaml > +++ b/Documentation/devicetree/bindings/pci/samsung,exynos-pcie.yaml > @@ -13,7 +13,7 @@ maintainers: > description: |+ > Exynos5433 SoC PCIe host controller is based on the Synopsys DesignWare > PCIe IP and thus inherits all the common properties defined in > - designware-pcie.txt. > + snps,dw-pcie.yaml. > > allOf: > - $ref: /schemas/pci/pci-bus.yaml# > diff --git a/Documentation/devicetree/bindings/pci/sifive,fu740-pcie.yaml b/Documentation/devicetree/bindings/pci/sifive,fu740-pcie.yaml > index b03cbb9b6602..0cc1998a9d46 100644 > --- a/Documentation/devicetree/bindings/pci/sifive,fu740-pcie.yaml > +++ b/Documentation/devicetree/bindings/pci/sifive,fu740-pcie.yaml > @@ -10,7 +10,7 @@ description: |+ > SiFive FU740 PCIe host controller is based on the Synopsys DesignWare > PCI core. It shares common features with the PCIe DesignWare core and > inherits common properties defined in > - Documentation/devicetree/bindings/pci/designware-pcie.txt. > + Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml. > > maintainers: > - Paul Walmsley <paul.walmsley@sifive.com> > diff --git a/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml b/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml > new file mode 100644 > index 000000000000..de463338b6ed > --- /dev/null > +++ b/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml > @@ -0,0 +1,135 @@ > +# SPDX-License-Identifier: GPL-2.0 > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/pci/snps,dw-pcie.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Synopsys DesignWare PCIe interface > + > +maintainers: > + - Jingoo Han <jingoohan1@gmail.com> > + - Gustavo Pimentel <gustavo.pimentel@synopsys.com> > + > +description: | > + Synopsys DesignWare PCIe host controller > + > +properties: > + compatible: > + anyOf: > + - {} > + - items: > + contains: Drop 'contains'. 'items' schema applies to array elements whereas 'contains' applies to an array. > + enum: > + - snps,dw-pcie > + - snps,dw-pcie-ep > + > + reg: > + description: | > + It should contain Data Bus Interface (dbi, dbi2) registers for all > + versions. Not all versions have dbi2. > + For designware cores version < 4.80, contains the configuration > + address space. For designware core version >= 4.80, > + contains the configuration and ATU address space. config space should always be present. For a brief time (around 2014), it was not required but has been since. For purposes of the schema, we can say always required. ATU is optional in 4.80 or later. > + minItems: 2 > + maxItems: 4 > + > + reg-names: > + minItems: 2 > + maxItems: 4 > + items: > + contains: Drop contains. > + enum: [dbi, dbi2, config, atu, addr_space] > + > + num-lanes: > + $ref: '/schemas/types.yaml#/definitions/uint32' > + description: | > + number of lanes to use (this property should be specified unless > + the link is brought already up in BIOS) > + maxItems: 1 Drop. Not an array. 'maximum: 16' is needed though pci-bus.yaml may cover that already. > + > + reset-gpio: > + description: GPIO pin number of PERST# signal > + maxItems: 1 deprecated: true And add 'reset-gpios' > + > + "snps,enable-cdm-check": Don't need quotes. > + type: boolean > + description: | > + This is a boolean property and if present enables > + automatic checking of CDM (Configuration Dependent Module) registers > + for data corruption. CDM registers include standard PCIe configuration > + space registers, Port Logic registers, DMA and iATU (internal Address > + Translation Unit) registers. > + > + num-viewport: > + description: | > + number of view ports configured in hardware. If a platform > + does not specify it, the driver assumes 2. That's no longer true. This and the next 2 properties are now detected if not specified. > + deprecated: true > + > + num-ib-windows: > + description: number of inbound address translation windows > + maxItems: 1 > + deprecated: true > + > + num-ob-windows: > + description: number of outbound address translation windows > + maxItems: 1 > + deprecated: true > + > + # The following are optional properties for EP mode > + > + max-functions: > + $ref: /schemas/types.yaml#/definitions/uint32 > + description: maximum number of functions that can be configured > + > +required: > + - reg > + - reg-names > + - compatible > + > +additionalProperties: false unevaluatedProperties: false so that we can have child PCI devices... > + > +allOf: > + - if: > + properties: > + compatible: > + contains: > + const: snps,dw-pcie > + then: > + allOf: > + - $ref: /schemas/pci/pci-bus.yaml# > + > +patternProperties: > + "pcie?_ep@[0-9a-f]+$": > + type: object > + properties: > + compatible: > + contains: > + const: snps,dw-pcie-ep This doesn't make sense. This is defining a child node of the DW controller with 'snps,dw-pcie-ep'. > + > + "pcie?@[0-9a-f]+$": > + type: object > + > +examples: > + - | > + pcie: pcie@dfc00000 { Drop unused labels. > + compatible = "snps,dw-pcie"; > + reg = <0xdfc00000 0x0001000>, /* IP registers */ > + <0xd0000000 0x0002000>; /* Configuration space */ > + reg-names = "dbi", "config"; > + #address-cells = <3>; > + #size-cells = <2>; > + device_type = "pci"; > + ranges = <0x81000000 0 0x00000000 0xde000000 0 0x00010000>, > + <0x82000000 0 0xd0400000 0xd0400000 0 0x0d000000>; > + interrupts = <25>, <24>; > + #interrupt-cells = <1>; > + num-lanes = <1>; > + }; > + pcie_ep: pcie_ep@dfd00000 { 'pcie-ep' is preferred. > + compatible = "snps,dw-pcie-ep"; > + reg = <0xdfc00000 0x0001000>, /* IP registers 1 */ > + <0xdfc01000 0x0001000>, /* IP registers 2 */ > + <0xd0000000 0x2000000>; /* Configuration space */ > + reg-names = "dbi", "dbi2", "addr_space"; > + }; ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 1/2] dt-bindings: PCI: designware-pcie.txt: convert it to yaml 2021-07-12 17:45 ` Rob Herring @ 2021-07-13 8:31 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 6+ messages in thread From: Mauro Carvalho Chehab @ 2021-07-13 8:31 UTC (permalink / raw) To: Rob Herring Cc: linuxarm, mauro.chehab, Andy Gross, Bjorn Andersson, Bjorn Helgaas, Fabio Estevam, Greentime Hu, Gustavo Pimentel, Jaehoon Chung, Jerome Brunet, Jesper Nilsson, Jingoo Han, Jonathan Chocron, Jonathan Hunter, Kevin Hilman, Kishon Vijay Abraham I, Krzysztof Kozlowski, Kunihiko Hayashi, Lucas Stach, Marek Szyprowski, Martin Blumenstingl, Masami Hiramatsu, NXP Linux Team, Neil Armstrong, Palmer Dabbelt, Paul Walmsley, Pengutronix Kernel Team, Richard Zhu, Sascha Hauer, Shawn Guo, Thierry Reding, Thomas Petazzoni, devicetree, linux-amlogic, linux-arm-kernel, linux-arm-kernel, linux-arm-msm, linux-kernel, linux-omap, linux-pci, linux-riscv, linux-samsung-soc, linux-tegra Em Mon, 12 Jul 2021 11:45:04 -0600 Rob Herring <robh@kernel.org> escreveu: > On Fri, Jul 09, 2021 at 03:57:42PM +0200, Mauro Carvalho Chehab wrote: > > Convert the file to DT schema. > > > > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > > diff --git a/Documentation/devicetree/bindings/pci/samsung,exynos-pcie.yaml b/Documentation/devicetree/bindings/pci/samsung,exynos-pcie.yaml > > index 1810bf722350..3f49c8017c7a 100644 > > --- a/Documentation/devicetree/bindings/pci/samsung,exynos-pcie.yaml > > +++ b/Documentation/devicetree/bindings/pci/samsung,exynos-pcie.yaml > > + reg: > > + description: | > > + It should contain Data Bus Interface (dbi, dbi2) registers for all > > + versions. > > Not all versions have dbi2. > > > + For designware cores version < 4.80, contains the configuration > > + address space. For designware core version >= 4.80, > > + contains the configuration and ATU address space. > > config space should always be present. For a brief time (around 2014), > it was not required but has been since. For purposes of the schema, we > can say always required. > > ATU is optional in 4.80 or later. > > > + minItems: 2 > > + maxItems: 4 > > + > > + reg-names: > > + minItems: 2 > > + maxItems: 4 > > + items: > > + contains: > > Drop contains. > > > + enum: [dbi, dbi2, config, atu, addr_space] This actually generated a warning: /new_devel/v4l/hikey970/Documentation/devicetree/bindings/pci/intel-gw-pcie.example.dt.yaml: pcie@d0e00000: reg-names:2: 'app' is not one of ['dbi', 'dbi2', 'config', 'atu', 'addr_space'] I guess it needs to be changed to: enum: [dbi, dbi2, config, atu, addr_space, app] or intel-gw-pcie.yaml would require an extra change. That's said, I didn't find any DTS using compatible = "intel,lgm-pcie", but looking at drivers/pci/controller/dwc/pcie-intel-gw.c, it seems that this is a mandatory register on such hardware. > > + > > + num-lanes: > > + $ref: '/schemas/types.yaml#/definitions/uint32' > > + description: | > > + number of lanes to use (this property should be specified unless > > + the link is brought already up in BIOS) > > + maxItems: 1 > > Drop. Not an array. 'maximum: 16' is needed though pci-bus.yaml may > cover that already. It seems that num-lanes is not there at pci-bus.yaml - at least not at the version I'm using here (2021.7.dev1+ge5f58d415b1d). > > +patternProperties: > > + "pcie?_ep@[0-9a-f]+$": > > + type: object > > + properties: > > + compatible: > > + contains: > > + const: snps,dw-pcie-ep > > This doesn't make sense. This is defining a child node of the DW > controller with 'snps,dw-pcie-ep'. This was an attempt to silence those warnings: From schema: /new_devel/v4l/hikey970/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml /new_devel/v4l/hikey970/Documentation/devicetree/bindings/pci/intel-gw-pcie.example.dt.yaml: pcie@d0e00000: '#address-cells', '#interrupt-cells', '#size-cells', 'bus-range', 'clocks', 'device_type', 'interrupt-map', 'interrupt-map-mask', 'linux,pci-domain', 'max-link-speed', 'phy-names', 'phys', 'ranges', 'reset-assert-ms', 'resets' do not match any of the regexes: 'pinctrl-[0-9]+' From schema: /new_devel/v4l/hikey970/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml /new_devel/v4l/hikey970/Documentation/devicetree/bindings/pci/snps,dw-pcie.example.dt.yaml: pcie@dfc00000: '#address-cells', '#interrupt-cells', '#size-cells', 'device_type', 'interrupts', 'ranges' do not match any of the regexes: 'pinctrl-[0-9]+' From schema: /new_devel/v4l/hikey970/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml Somehow, dtschema is only accepting 'pinctrl-[0-9]+' regex when parsing examples on this file. I've no idea how to fix it. As a reference, this is how the examples are now declared: <snip> examples: - | pcie@dfc00000 { compatible = "snps,dw-pcie"; reg = <0xdfc00000 0x0001000>, /* IP registers */ <0xd0000000 0x0002000>; /* Configuration space */ reg-names = "dbi", "config"; #address-cells = <3>; #size-cells = <2>; device_type = "pci"; ranges = <0x81000000 0 0x00000000 0xde000000 0 0x00010000>, <0x82000000 0 0xd0400000 0xd0400000 0 0x0d000000>; interrupts = <25>, <24>; #interrupt-cells = <1>; num-lanes = <1>; }; pcie-ep@dfd00000 { compatible = "snps,dw-pcie-ep"; reg = <0xdfc00000 0x0001000>, /* IP registers 1 */ <0xdfc01000 0x0001000>, /* IP registers 2 */ <0xd0000000 0x2000000>; /* Configuration space */ reg-names = "dbi", "dbi2", "addr_space"; }; </snip> Thanks, Mauro ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3 2/2] dt-bindings: PCI: kirin-pcie.txt: convert it to yaml 2021-07-09 13:57 [PATCH v3 0/2] convert designware-pcie.txt and kirin-pcie.txt to yaml Mauro Carvalho Chehab 2021-07-09 13:57 ` [PATCH v3 1/2] dt-bindings: PCI: designware-pcie.txt: convert it " Mauro Carvalho Chehab @ 2021-07-09 13:57 ` Mauro Carvalho Chehab 1 sibling, 0 replies; 6+ messages in thread From: Mauro Carvalho Chehab @ 2021-07-09 13:57 UTC (permalink / raw) To: Rob Herring Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Binghui Wang, Bjorn Helgaas, Rob Herring, Xiaowei Song, devicetree, linux-kernel, linux-pci Convert the file into a JSON description at the yaml format. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../bindings/pci/hisilicon,kirin-pcie.yaml | 79 +++++++++++++++++++ .../devicetree/bindings/pci/kirin-pcie.txt | 41 ---------- MAINTAINERS | 2 +- 3 files changed, 80 insertions(+), 42 deletions(-) create mode 100644 Documentation/devicetree/bindings/pci/hisilicon,kirin-pcie.yaml delete mode 100644 Documentation/devicetree/bindings/pci/kirin-pcie.txt diff --git a/Documentation/devicetree/bindings/pci/hisilicon,kirin-pcie.yaml b/Documentation/devicetree/bindings/pci/hisilicon,kirin-pcie.yaml new file mode 100644 index 000000000000..66271419cd6e --- /dev/null +++ b/Documentation/devicetree/bindings/pci/hisilicon,kirin-pcie.yaml @@ -0,0 +1,79 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/pci/hisilicon,kirin-pcie.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: HiSilicon Kirin SoCs PCIe host DT description + +maintainers: + - Xiaowei Song <songxiaowei@hisilicon.com> + - Binghui Wang <wangbinghui@hisilicon.com> + +description: | + Kirin PCIe host controller is based on the Synopsys DesignWare PCI core. + It shares common functions with the PCIe DesignWare core driver and + inherits common properties defined in + Documentation/devicetree/bindings/pci/designware,pcie.yaml. + +allOf: + - $ref: /schemas/pci/pci-bus.yaml# + +properties: + compatible: + const: hisilicon,kirin960-pcie + const: hisilicon,kirin970-pcie + + reg: + description: | + Should contain rc_dbi, apb, config registers location and length. + + reg-names: + items: + - const: dbi # controller configuration registers + - const: apb # apb Ctrl register defined by Kirin + - const: config # PCIe configuration space registers + + "#address-cells": + const: 3 + + "#size-cells": + const: 2 + +required: + - compatible + - reg + - reg-names + +unevaluatedProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + + soc { + #address-cells = <2>; + #size-cells = <2>; + + pcie: pcie@f4000000 { + compatible = "hisilicon,kirin960-pcie"; + reg = <0x0 0xf4000000 0x0 0x1000>, + <0x0 0xff3fe000 0x0 0x1000>, + <0x0 0xf4000000 0 0x2000>; + reg-names = "dbi","apb", "config"; + bus-range = <0x0 0x1>; + #address-cells = <3>; + #size-cells = <2>; + device_type = "pci"; + ranges = <0x02000000 0x0 0x00000000 0x0 0xf5000000 0x0 0x2000000>; + num-lanes = <1>; + #interrupt-cells = <1>; + interrupts = <0 283 4>; + interrupt-names = "msi"; + interrupt-map-mask = <0xf800 0 0 7>; + interrupt-map = <0x0 0 0 1 &gic GIC_SPI 282 IRQ_TYPE_LEVEL_HIGH>, + <0x0 0 0 2 &gic GIC_SPI 283 IRQ_TYPE_LEVEL_HIGH>, + <0x0 0 0 3 &gic GIC_SPI 284 IRQ_TYPE_LEVEL_HIGH>, + <0x0 0 0 4 &gic GIC_SPI 285 IRQ_TYPE_LEVEL_HIGH>; + }; + }; diff --git a/Documentation/devicetree/bindings/pci/kirin-pcie.txt b/Documentation/devicetree/bindings/pci/kirin-pcie.txt deleted file mode 100644 index 3a36eeb1c434..000000000000 --- a/Documentation/devicetree/bindings/pci/kirin-pcie.txt +++ /dev/null @@ -1,41 +0,0 @@ -HiSilicon Kirin SoCs PCIe host DT description - -Kirin PCIe host controller is based on the Synopsys DesignWare PCI core. -It shares common functions with the PCIe DesignWare core driver and -inherits common properties defined in -Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml. - -Additional properties are described here: - -Required properties -- compatible: - "hisilicon,kirin960-pcie" - "hisilicon,kirin970-pcie" -- reg: Should contain rc_dbi, apb, config registers location and length. -- reg-names: Must include the following entries: - "dbi": controller configuration registers; - "apb": apb Ctrl register defined by Kirin; - "config": PCIe configuration space registers. - -Optional properties: - -Example based on kirin960: - - pcie@f4000000 { - compatible = "hisilicon,kirin960-pcie"; - reg = <0x0 0xf4000000 0x0 0x1000>, <0x0 0xff3fe000 0x0 0x1000>, - <0x0 0xF4000000 0 0x2000>; - reg-names = "dbi","apb", "config"; - bus-range = <0x0 0x1>; - #address-cells = <3>; - #size-cells = <2>; - device_type = "pci"; - ranges = <0x02000000 0x0 0x00000000 0x0 0xf5000000 0x0 0x2000000>; - num-lanes = <1>; - #interrupt-cells = <1>; - interrupt-map-mask = <0xf800 0 0 7>; - interrupt-map = <0x0 0 0 1 &gic 0 0 0 282 4>, - <0x0 0 0 2 &gic 0 0 0 283 4>, - <0x0 0 0 3 &gic 0 0 0 284 4>, - <0x0 0 0 4 &gic 0 0 0 285 4>; - }; diff --git a/MAINTAINERS b/MAINTAINERS index 55ca4cac17b0..d5a592db84d9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14369,7 +14369,7 @@ M: Xiaowei Song <songxiaowei@hisilicon.com> M: Binghui Wang <wangbinghui@hisilicon.com> L: linux-pci@vger.kernel.org S: Maintained -F: Documentation/devicetree/bindings/pci/kirin-pcie.txt +F: Documentation/devicetree/bindings/pci/hisilicon,kirin-pcie.yaml F: drivers/pci/controller/dwc/pcie-kirin.c PCIE DRIVER FOR HISILICON STB -- 2.31.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-07-13 8:31 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-07-09 13:57 [PATCH v3 0/2] convert designware-pcie.txt and kirin-pcie.txt to yaml Mauro Carvalho Chehab 2021-07-09 13:57 ` [PATCH v3 1/2] dt-bindings: PCI: designware-pcie.txt: convert it " Mauro Carvalho Chehab 2021-07-12 14:12 ` Rob Herring 2021-07-12 17:45 ` Rob Herring 2021-07-13 8:31 ` Mauro Carvalho Chehab 2021-07-09 13:57 ` [PATCH v3 2/2] dt-bindings: PCI: kirin-pcie.txt: " Mauro Carvalho Chehab
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).