| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <YkHg0UeS9kPOW6Kf@robh.at.kernel.org>
Date: Mon, 28 Mar 2022 11:22:41 -0500
From: Rob Herring <robh@...nel.org>
To: Kunihiko Hayashi <hayashi.kunihiko@...ionext.com>
Cc: Bjorn Helgaas <bhelgaas@...gle.com>,
Krzysztof Kozlowski <krzysztof.kozlowski@...onical.com>,
Masami Hiramatsu <mhiramat@...nel.org>,
linux-pci@...r.kernel.org, devicetree@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] dt-bindings: PCI: uniphier: Convert uniphier-pcie.txt to
json-schema
On Mon, Mar 28, 2022 at 11:11:38AM +0900, Kunihiko Hayashi wrote:
> Convert the file into a JSON description at the yaml format.
>
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@...ionext.com>
> ---
> .../bindings/pci/socionext,uniphier-pcie.yaml | 100 ++++++++++++++++++
> .../devicetree/bindings/pci/uniphier-pcie.txt | 82 --------------
> MAINTAINERS | 2 +-
> 3 files changed, 101 insertions(+), 83 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/pci/socionext,uniphier-pcie.yaml
> delete mode 100644 Documentation/devicetree/bindings/pci/uniphier-pcie.txt
>
> diff --git a/Documentation/devicetree/bindings/pci/socionext,uniphier-pcie.yaml b/Documentation/devicetree/bindings/pci/socionext,uniphier-pcie.yaml
> new file mode 100644
> index 000000000000..57176f62f955
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/pci/socionext,uniphier-pcie.yaml
> @@ -0,0 +1,100 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/pci/socionext,uniphier-pcie.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Socionext UniPhier PCIe host controller
> +
> +description: |
> + UniPhier 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/snps,dw-pcie.yaml.
> +
> +maintainers:
> + - Kunihiko Hayashi <hayashi.kunihiko@...ionext.com>
> +
> +allOf:
> + - $ref: /schemas/pci/snps,dw-pcie.yaml#
> +
> +properties:
> + compatible:
> + enum:
> + - socionext,uniphier-pcie
> +
> + reg:
> + minItems: 3
> + maxItems: 4
> +
> + reg-names:
> + oneOf:
> + - items:
> + - const: dbi
> + - const: link
> + - const: config
> + - items:
> + - const: dbi
> + - const: link
> + - const: config
> + - const: atu
You can have just the 2nd list plus 'minItems: 3' to do the same thing.
> +
> + clocks:
> + maxItems: 1
> +
> + resets:
> + maxItems: 1
> +
> + num-viewport: true
> +
> + num-lanes: true
> +
> + phys:
> + maxItems: 1
> +
> + phy-names:
> + const: pcie-phy
> +
> +required:
> + - compatible
> + - reg
> + - reg-names
> + - clocks
> + - resets
> +
> +unevaluatedProperties: false
> +
> +examples:
> + - |
> + pcie: pcie@...00000 {
> + compatible = "socionext,uniphier-pcie";
> + reg-names = "dbi", "link", "config";
> + reg = <0x66000000 0x1000>, <0x66010000 0x10000>, <0x2fff0000 0x10000>;
> + #address-cells = <3>;
> + #size-cells = <2>;
> + clocks = <&sys_clk 24>;
> + resets = <&sys_rst 24>;
> + num-lanes = <1>;
> + num-viewport = <1>;
> + bus-range = <0x0 0xff>;
> + device_type = "pci";
> + ranges = <0x81000000 0 0x00000000 0x2ffe0000 0 0x00010000>,
> + <0x82000000 0 0x00000000 0x20000000 0 0x0ffe0000>;
> + phy-names = "pcie-phy";
> + phys = <&pcie_phy>;
> + #interrupt-cells = <1>;
> + interrupt-names = "dma", "msi";
> + interrupts = <0 224 4>, <0 225 4>;
> + interrupt-map-mask = <0 0 0 7>;
> + interrupt-map = <0 0 0 1 &pcie_intc 0>,
> + <0 0 0 2 &pcie_intc 1>,
> + <0 0 0 3 &pcie_intc 2>,
> + <0 0 0 4 &pcie_intc 3>;
> +
> + pcie_intc: legacy-interrupt-controller {
> + interrupt-controller;
> + #interrupt-cells = <1>;
> + interrupt-parent = <&gic>;
> + interrupts = <0 226 4>;
> + };
> + };
> diff --git a/Documentation/devicetree/bindings/pci/uniphier-pcie.txt b/Documentation/devicetree/bindings/pci/uniphier-pcie.txt
> deleted file mode 100644
> index 359585db049f..000000000000
> --- a/Documentation/devicetree/bindings/pci/uniphier-pcie.txt
> +++ /dev/null
> @@ -1,82 +0,0 @@
> -Socionext UniPhier PCIe host controller bindings
> -
> -This describes the devicetree bindings for PCIe host controller implemented
> -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/snps,dw-pcie.yaml.
> -
> -Required properties:
> -- compatible: Should be "socionext,uniphier-pcie".
> -- reg: Specifies offset and length of the register set for the device.
> - According to the reg-names, appropriate register sets are required.
> -- reg-names: Must include the following entries:
> - "dbi" - controller configuration registers
> - "link" - SoC-specific glue layer registers
> - "config" - PCIe configuration space
> - "atu" - iATU registers for DWC version 4.80 or later
> -- clocks: A phandle to the clock gate for PCIe glue layer including
> - the host controller.
> -- resets: A phandle to the reset line for PCIe glue layer including
> - the host controller.
> -- interrupts: A list of interrupt specifiers. According to the
> - interrupt-names, appropriate interrupts are required.
> -- interrupt-names: Must include the following entries:
> - "dma" - DMA interrupt
> - "msi" - MSI interrupt
> -
> -Optional properties:
> -- phys: A phandle to generic PCIe PHY. According to the phy-names, appropriate
> - phys are required.
> -- phy-names: Must be "pcie-phy".
> -
> -Required sub-node:
> -- legacy-interrupt-controller: Specifies interrupt controller for legacy PCI
> - interrupts.
> -
> -Required properties for legacy-interrupt-controller:
> -- interrupt-controller: identifies the node as an interrupt controller.
> -- #interrupt-cells: specifies the number of cells needed to encode an
> - interrupt source. The value must be 1.
> -- interrupt-parent: Phandle to the parent interrupt controller.
> -- interrupts: An interrupt specifier for legacy interrupt.
> -
> -Example:
> -
> - pcie: pcie@...00000 {
> - compatible = "socionext,uniphier-pcie", "snps,dw-pcie";
> - status = "disabled";
> - reg-names = "dbi", "link", "config";
> - reg = <0x66000000 0x1000>, <0x66010000 0x10000>,
> - <0x2fff0000 0x10000>;
> - #address-cells = <3>;
> - #size-cells = <2>;
> - clocks = <&sys_clk 24>;
> - resets = <&sys_rst 24>;
> - num-lanes = <1>;
> - num-viewport = <1>;
> - bus-range = <0x0 0xff>;
> - device_type = "pci";
> - ranges =
> - /* downstream I/O */
> - <0x81000000 0 0x00000000 0x2ffe0000 0 0x00010000
> - /* non-prefetchable memory */
> - 0x82000000 0 0x00000000 0x20000000 0 0x0ffe0000>;
> - #interrupt-cells = <1>;
> - interrupt-names = "dma", "msi";
> - interrupts = <0 224 4>, <0 225 4>;
> - interrupt-map-mask = <0 0 0 7>;
> - interrupt-map = <0 0 0 1 &pcie_intc 0>, /* INTA */
> - <0 0 0 2 &pcie_intc 1>, /* INTB */
> - <0 0 0 3 &pcie_intc 2>, /* INTC */
> - <0 0 0 4 &pcie_intc 3>; /* INTD */
> -
> - pcie_intc: legacy-interrupt-controller {
> - interrupt-controller;
> - #interrupt-cells = <1>;
> - interrupt-parent = <&gic>;
> - interrupts = <0 226 4>;
> - };
> - };
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 4cc47b2dbdc9..c1d377be991c 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -15337,7 +15337,7 @@ PCIE DRIVER FOR SOCIONEXT UNIPHIER
> M: Kunihiko Hayashi <hayashi.kunihiko@...ionext.com>
> L: linux-pci@...r.kernel.org
> S: Maintained
> -F: Documentation/devicetree/bindings/pci/uniphier-pcie*
> +F: Documentation/devicetree/bindings/pci/socionext,uniphier-pcie*
> F: drivers/pci/controller/dwc/pcie-uniphier*
>
> PCIE DRIVER FOR ST SPEAR13XX
> --
> 2.25.1
>
Powered by blists - more mailing lists