| 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: <215115d8-b312-498f-a3a7-0a3cee38ebf3@altera.com>
Date: Thu, 5 Jun 2025 15:41:24 -0700
From: Matthew Gerlach <matthew.gerlach@...era.com>
To: Rob Herring <robh@...nel.org>
Cc: andrew+netdev@...n.ch, davem@...emloft.net, edumazet@...gle.com,
kuba@...nel.org, pabeni@...hat.com, krzk+dt@...nel.org, conor+dt@...nel.org,
maxime.chevallier@...tlin.com, richardcochran@...il.com,
netdev@...r.kernel.org, devicetree@...r.kernel.org,
linux-kernel@...r.kernel.org, Mun Yew Tham <mun.yew.tham@...era.com>
Subject: Re: [PATCH v3] dt-bindings: net: Convert socfpga-dwmac bindings to
yaml
On 6/5/25 10:59 AM, Rob Herring wrote:
> On Fri, May 30, 2025 at 08:32:41AM -0700, Matthew Gerlach wrote:
> > From: Mun Yew Tham <mun.yew.tham@...era.com>
> >
> > Convert the bindings for socfpga-dwmac to yaml.
> >
> > Signed-off-by: Mun Yew Tham <mun.yew.tham@...era.com>
> > Signed-off-by: Matthew Gerlach <matthew.gerlach@...era.com>
> > ---
> > v3:
> > - Add missing supported phy-modes.
> >
> > v2:
> > - Add compatible to required.
> > - Add descriptions for clocks.
> > - Add clock-names.
> > - Clean up items: in altr,sysmgr-syscon.
> > - Change "additionalProperties: true" to "unevaluatedProperties: false".
> > - Add properties needed for "unevaluatedProperties: false".
> > - Fix indentation in examples.
> > - Drop gmac0: label in examples.
> > - Exclude support for Arria10 that is not validating.
> > ---
> > .../bindings/net/socfpga,dwmac.yaml | 153 ++++++++++++++++++
>
> Filename should be altr,socfpga-stmmac.yaml
That is a better filename.
>
> Don't forget the $id
Thanks for the reminder.
>
> > .../devicetree/bindings/net/socfpga-dwmac.txt | 57 -------
> > 2 files changed, 153 insertions(+), 57 deletions(-)
> > create mode 100644 Documentation/devicetree/bindings/net/socfpga,dwmac.yaml
> > delete mode 100644 Documentation/devicetree/bindings/net/socfpga-dwmac.txt
> >
> > diff --git a/Documentation/devicetree/bindings/net/socfpga,dwmac.yaml b/Documentation/devicetree/bindings/net/socfpga,dwmac.yaml
> > new file mode 100644
> > index 000000000000..29dad0b58e1a
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/net/socfpga,dwmac.yaml
> > @@ -0,0 +1,153 @@
> > +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
> > +%YAML 1.2
> > +---
> > +$id: http://devicetree.org/schemas/net/socfpga,dwmac.yaml#
> > +$schema: http://devicetree.org/meta-schemas/core.yaml#
> > +
> > +title: Altera SOCFPGA SoC DWMAC controller
> > +
> > +maintainers:
> > + - Matthew Gerlach <matthew.gerlach@...era.com>
> > +
> > +description:
> > + This binding describes the Altera SOCFPGA SoC implementation of the
> > + Synopsys DWMAC for the Cyclone5, Arria5, Stratix10, and Agilex7 families
> > + of chips.
> > + # TODO: Determine how to handle the Arria10 reset-name, stmmaceth-ocp, that
> > + # does not validate against net/snps,dwmac.yaml.
> > +
> > +select:
> > + properties:
> > + compatible:
> > + oneOf:
> > + - items:
> > + - const: altr,socfpga-stmmac
> > + - const: snps,dwmac-3.70a
> > + - const: snps,dwmac
> > + - items:
> > + - const: altr,socfpga-stmmac-a10-s10
> > + - const: snps,dwmac-3.74a
> > + - const: snps,dwmac
>
> This should be defined under 'properties'. The select just needs:
>
> contains:
> enum:
> - altr,socfpga-stmmac
> - altr,socfpga-stmmac-a10-s10
Got it.
>
> > +
> > + required:
> > + - compatible
> > + - altr,sysmgr-syscon
> > +
> > +properties:
> > + clocks:
> > + minItems: 1
> > + items:
> > + - description: GMAC main clock
> > + - description:
> > + PTP reference clock. This clock is used for programming the
> > + Timestamp Addend Register. If not passed then the system
> > + clock will be used and this is fine on some platforms.
> > +
> > + clock-names:
> > + minItems: 1
> > + maxItems: 2
> > + contains:
> > + enum:
> > + - stmmaceth
> > + - ptp_ref
>
> stmmaceth clock is not required? Looks like it is from 'clocks' schema.
> I'd expect this:
>
> minItems: 1
> items:
> - const: stmmaceth
> - const: ptp_ref
This is a better description of the hardware requirements.
> > +
> > + iommus:
> > + maxItems: 1
> > +
> > + phy-mode:
> > + enum:
> > + - gmii
> > + - mii
> > + - rgmii
> > + - rgmii-id
> > + - rgmii-rxid
> > + - rgmii-txid
> > + - sgmii
> > + - 1000base-x
> > +
> > + rxc-skew-ps:
> > + description: Skew control of RXC pad
> > +
> > + rxd0-skew-ps:
> > + description: Skew control of RX data 0 pad
> > +
> > + rxd1-skew-ps:
> > + description: Skew control of RX data 1 pad
> > +
> > + rxd2-skew-ps:
> > + description: Skew control of RX data 2 pad
> > +
> > + rxd3-skew-ps:
> > + description: Skew control of RX data 3 pad
> > +
> > + rxdv-skew-ps:
> > + description: Skew control of RX CTL pad
> > +
> > + txc-skew-ps:
> > + description: Skew control of TXC pad
> > +
> > + txen-skew-ps:
> > + description: Skew control of TXC pad
> > +
> > + altr,emac-splitter:
> > + $ref: /schemas/types.yaml#/definitions/phandle
> > + description:
> > + Should be the phandle to the emac splitter soft IP node if DWMAC
> > + controller is connected an emac splitter.
> > +
> > + altr,f2h_ptp_ref_clk:
> > + $ref: /schemas/types.yaml#/definitions/phandle
> > + description:
> > + Phandle to Precision Time Protocol reference clock. This clock is
> > + common to gmac instances and defaults to osc1.
> > +
> > + altr,gmii-to-sgmii-converter:
> > + $ref: /schemas/types.yaml#/definitions/phandle
> > + description:
> > + Should be the phandle to the gmii to sgmii converter soft IP.
> > +
> > + altr,sysmgr-syscon:
> > + $ref: /schemas/types.yaml#/definitions/phandle-array
> > + description:
> > + Should be the phandle to the system manager node that encompass
> > + the glue register, the register offset, and the register shift.
> > + On Cyclone5/Arria5, the register shift represents the PHY mode
> > + bits, while on the Arria10/Stratix10/Agilex platforms, the
> > + register shift represents bit for each emac to enable/disable
> > + signals from the FPGA fabric to the EMAC modules.
> > + items:
> > + - items:
> > + - description: phandle to the system manager node
> > + - description: offset of the control register
> > + - description: shift within the control register
> > +
> > +patternProperties:
> > + "^mdio[0-9]$":
> > + type: object
> > +
> > +allOf:
> > + - $ref: snps,dwmac.yaml#
> > +
> > +unevaluatedProperties: false
> > +
> > +examples:
> > +
> > + - |
> > + #include <dt-bindings/interrupt-controller/arm-gic.h>
> > + #include <dt-bindings/interrupt-controller/irq.h>
> > + soc {
> > + #address-cells = <1>;
> > + #size-cells = <1>;
> > + ethernet@...00000 {
> > + compatible = "altr,socfpga-stmmac", "snps,dwmac-3.70a",
> > + "snps,dwmac";
> > + altr,sysmgr-syscon = <&sysmgr 0x60 0>;
> > + reg = <0xff700000 0x2000>;
> > + interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;
> > + interrupt-names = "macirq";
> > + mac-address = [00 00 00 00 00 00]; /* Filled in by U-Boot */
> > + clocks = <&emac_0_clk>;
> > + clock-names = "stmmaceth";
> > + phy-mode = "sgmii";
> > + };
> > + };
> > diff --git a/Documentation/devicetree/bindings/net/socfpga-dwmac.txt b/Documentation/devicetree/bindings/net/socfpga-dwmac.txt
> > deleted file mode 100644
> > index 612a8e8abc88..000000000000
> > --- a/Documentation/devicetree/bindings/net/socfpga-dwmac.txt
> > +++ /dev/null
> > @@ -1,57 +0,0 @@
> > -Altera SOCFPGA SoC DWMAC controller
> > -
> > -This is a variant of the dwmac/stmmac driver an inherits all descriptions
> > -present in Documentation/devicetree/bindings/net/stmmac.txt.
> > -
> > -The device node has additional properties:
> > -
> > -Required properties:
> > - - compatible : For Cyclone5/Arria5 SoCs it should contain
> > - "altr,socfpga-stmmac". For Arria10/Agilex/Stratix10 SoCs
> > - "altr,socfpga-stmmac-a10-s10".
> > - Along with "snps,dwmac" and any applicable more detailed
> > - designware version numbers documented in stmmac.txt
> > - - altr,sysmgr-syscon : Should be the phandle to the system manager node that
> > - encompasses the glue register, the register offset, and the register shift.
> > - On Cyclone5/Arria5, the register shift represents the PHY mode bits, while
> > - on the Arria10/Stratix10/Agilex platforms, the register shift represents
> > - bit for each emac to enable/disable signals from the FPGA fabric to the
> > - EMAC modules.
> > - - altr,f2h_ptp_ref_clk use f2h_ptp_ref_clk instead of default eosc1 clock
> > - for ptp ref clk. This affects all emacs as the clock is common.
> > -
> > -Optional properties:
> > -altr,emac-splitter: Should be the phandle to the emac splitter soft IP node if
> > - DWMAC controller is connected emac splitter.
> > -phy-mode: The phy mode the ethernet operates in
> > -altr,sgmii-to-sgmii-converter: phandle to the TSE SGMII converter
> > -
> > -This device node has additional phandle dependency, the sgmii converter:
> > -
> > -Required properties:
> > - - compatible : Should be altr,gmii-to-sgmii-2.0
>
> You need a binding schema for this node.
I will add a binding schema for the altr,gmii-to-sgmii.
Thanks for the review,
Matthew Gerlach
>
> > - - reg-names : Should be "eth_tse_control_port"
> > -
> > -Example:
> > -
> > -gmii_to_sgmii_converter: phy@...000240 {
> > - compatible = "altr,gmii-to-sgmii-2.0";
> > - reg = <0x00000001 0x00000240 0x00000008>,
> > - <0x00000001 0x00000200 0x00000040>;
> > - reg-names = "eth_tse_control_port";
> > - clocks = <&sgmii_1_clk_0 &emac1 1 &sgmii_clk_125 &sgmii_clk_125>;
> > - clock-names = "tse_pcs_ref_clk_clock_connection", "tse_rx_cdr_refclk";
> > -};
> > -
> > -gmac0: ethernet@...00000 {
> > - compatible = "altr,socfpga-stmmac", "snps,dwmac-3.70a", "snps,dwmac";
> > - altr,sysmgr-syscon = <&sysmgr 0x60 0>;
> > - reg = <0xff700000 0x2000>;
> > - interrupts = <0 115 4>;
> > - interrupt-names = "macirq";
> > - mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */
> > - clocks = <&emac_0_clk>;
> > - clock-names = "stmmaceth";
> > - phy-mode = "sgmii";
> > - altr,gmii-to-sgmii-converter = <&gmii_to_sgmii_converter>;
> > -};
> > --
> > 2.35.3
> >
Powered by blists - more mailing lists