| Message ID | aa5ec90854429c2d9e2c565604243e1b10cfd94b.1558605170.git-series.maxime.ripard@bootlin.com |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | [1/8] dt-bindings: net: Add YAML schemas for the generic Ethernet options | expand |
| Context | Check | Description |
|---|---|---|
| robh/checkpatch | success |
On Thu, May 23, 2019 at 11:56:45AM +0200, Maxime Ripard wrote: > The networking PHYs have a number of available device tree properties that > can be used in their device tree node. Add a YAML schemas for those. > > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> > --- > Documentation/devicetree/bindings/net/ethernet-phy.yaml | 148 +++++++++- > Documentation/devicetree/bindings/net/phy.txt | 80 +----- > 2 files changed, 149 insertions(+), 79 deletions(-) > create mode 100644 Documentation/devicetree/bindings/net/ethernet-phy.yaml > > diff --git a/Documentation/devicetree/bindings/net/ethernet-phy.yaml b/Documentation/devicetree/bindings/net/ethernet-phy.yaml > new file mode 100644 > index 000000000000..eb79ee6db977 > --- /dev/null > +++ b/Documentation/devicetree/bindings/net/ethernet-phy.yaml > @@ -0,0 +1,148 @@ > +# SPDX-License-Identifier: GPL-2.0 > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/net/ethernet-phy.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Ethernet PHY Generic Binding > + > +maintainers: > + - David S. Miller <davem@davemloft.net> > + > +properties: > + $nodename: > + pattern: "^ethernet-phy(@[a-f0-9])?$" > + > + compatible: > + oneOf: I don't know the language. It is valid to have both ethernet-phy-ieee802.3-c45 and ethernet-phy-id[a-f0-9]{4}\\.[a-f0-9]{4}$". Does this oneOf prevent multiple compatible strings? Also, the general case is no compatible at all. > + - const: ethernet-phy-ieee802.3-c22 > + description: PHYs that implement IEEE802.3 clause 22 > + - const: ethernet-phy-ieee802.3-c45 > + description: PHYs that implement IEEE802.3 clause 45 > + - pattern: "^ethernet-phy-id[a-f0-9]{4}\\.[a-f0-9]{4}$" > + description: > + The first group of digits is the 16 bit Phy Identifier 1 > + register, this is the chip vendor OUI bits 3:18. The > + second group of digits is the Phy Identifier 2 register, > + this is the chip vendor OUI bits 19:24, followed by 10 > + bits of a vendor specific ID. Could we try to retain: > - If the PHY reports an incorrect ID (or none at all) then the > - "compatible" list may contain an entry with the correct PHY ID in the ... Using it is generally wrong, and that is not clear in the new text. > + > + reg: > + maxItems: 1 > + minimum: 0 > + maximum: 31 > + description: > + The ID number for the PHY. > + > + interrupts: > + maxItems: 1 > + > + max-speed: > + enum: > + - 10 > + - 100 > + - 1000 This is outdated in the text description. Any valid speed is supported, currently 10 - 200000, as listed in phy_setting settings(). Andrew
On Thu, May 23, 2019 at 4:57 AM Maxime Ripard <maxime.ripard@bootlin.com> wrote: > > The networking PHYs have a number of available device tree properties that > can be used in their device tree node. Add a YAML schemas for those. > > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> > --- > Documentation/devicetree/bindings/net/ethernet-phy.yaml | 148 +++++++++- > Documentation/devicetree/bindings/net/phy.txt | 80 +----- > 2 files changed, 149 insertions(+), 79 deletions(-) > create mode 100644 Documentation/devicetree/bindings/net/ethernet-phy.yaml > > diff --git a/Documentation/devicetree/bindings/net/ethernet-phy.yaml b/Documentation/devicetree/bindings/net/ethernet-phy.yaml > new file mode 100644 > index 000000000000..eb79ee6db977 > --- /dev/null > +++ b/Documentation/devicetree/bindings/net/ethernet-phy.yaml > @@ -0,0 +1,148 @@ > +# SPDX-License-Identifier: GPL-2.0 > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/net/ethernet-phy.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Ethernet PHY Generic Binding > + > +maintainers: > + - David S. Miller <davem@davemloft.net> > + > +properties: > + $nodename: > + pattern: "^ethernet-phy(@[a-f0-9])?$" > + > + compatible: > + oneOf: > + - const: ethernet-phy-ieee802.3-c22 > + description: PHYs that implement IEEE802.3 clause 22 > + - const: ethernet-phy-ieee802.3-c45 > + description: PHYs that implement IEEE802.3 clause 45 > + - pattern: "^ethernet-phy-id[a-f0-9]{4}\\.[a-f0-9]{4}$" > + description: > + The first group of digits is the 16 bit Phy Identifier 1 > + register, this is the chip vendor OUI bits 3:18. The > + second group of digits is the Phy Identifier 2 register, > + this is the chip vendor OUI bits 19:24, followed by 10 > + bits of a vendor specific ID. > + > + reg: > + maxItems: 1 > + minimum: 0 > + maximum: 31 min/max need to be under 'items'. I don't think these would ever be valid if the type is an array. I've modified the meta-schema to catch this. > + description: > + The ID number for the PHY. > + > + interrupts: > + maxItems: 1 > + > + max-speed: > + enum: > + - 10 > + - 100 > + - 1000 > + description: > + Maximum PHY supported speed in Mbits / seconds. > + > + broken-turn-around: > + $ref: /schemas/types.yaml#definitions/flag > + description: > + If set, indicates the PHY device does not correctly release > + the turn around line low at the end of a MDIO transaction. > + > + enet-phy-lane-swap: > + $ref: /schemas/types.yaml#definitions/flag > + description: > + If set, indicates the PHY will swap the TX/RX lanes to > + compensate for the board being designed with the lanes > + swapped. > + > + eee-broken-100tx: > + $ref: /schemas/types.yaml#definitions/flag > + description: > + Mark the corresponding energy efficient ethernet mode as > + broken and request the ethernet to stop advertising it. > + > + eee-broken-1000t: > + $ref: /schemas/types.yaml#definitions/flag > + description: > + Mark the corresponding energy efficient ethernet mode as > + broken and request the ethernet to stop advertising it. > + > + eee-broken-10gt: > + $ref: /schemas/types.yaml#definitions/flag > + description: > + Mark the corresponding energy efficient ethernet mode as > + broken and request the ethernet to stop advertising it. > + > + eee-broken-1000kx: > + $ref: /schemas/types.yaml#definitions/flag > + description: > + Mark the corresponding energy efficient ethernet mode as > + broken and request the ethernet to stop advertising it. > + > + eee-broken-10gkx4: > + $ref: /schemas/types.yaml#definitions/flag > + description: > + Mark the corresponding energy efficient ethernet mode as > + broken and request the ethernet to stop advertising it. > + > + eee-broken-10gkr: > + $ref: /schemas/types.yaml#definitions/flag > + description: > + Mark the corresponding energy efficient ethernet mode as > + broken and request the ethernet to stop advertising it. > + > + phy-is-integrated: > + $ref: /schemas/types.yaml#definitions/flag > + description: > + If set, indicates that the PHY is integrated into the same > + physical package as the Ethernet MAC. If needed, muxers > + should be configured to ensure the integrated PHY is > + used. The absence of this property indicates the muxers > + should be configured so that the external PHY is used. > + > + resets: > + maxItems: 1 > + > + reset-names: > + const: phy > + > + reset-gpios: > + description: > + The GPIO phandle and specifier for the PHY reset signal. maxItems: 1 I have a meta-schema change to catch this, but It will require updates to some existing cases. > + > + reset-assert-us: > + description: > + Delay after the reset was asserted in microseconds. If this > + property is missing the delay will be skipped. > + > + reset-deassert-us: > + description: > + Delay after the reset was deasserted in microseconds. If > + this property is missing the delay will be skipped. > + > +required: > + - reg > + - interrupts > + > +examples: > + - | > + ethernet { > + #address-cells = <1>; > + #size-cells = <0>; > + > + ethernet-phy@0 { > + compatible = "ethernet-phy-id0141.0e90", "ethernet-phy-ieee802.3-c22"; > + interrupt-parent = <&PIC>; > + interrupts = <35 1>; > + reg = <0>; > + > + resets = <&rst 8>; > + reset-names = "phy"; > + reset-gpios = <&gpio1 4 1>; > + reset-assert-us = <1000>; > + reset-deassert-us = <2000>; > + }; > + };
On 5/23/19 2:56 AM, Maxime Ripard wrote: > The networking PHYs have a number of available device tree properties that > can be used in their device tree node. Add a YAML schemas for those. > > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> > --- > Documentation/devicetree/bindings/net/ethernet-phy.yaml | 148 +++++++++- > Documentation/devicetree/bindings/net/phy.txt | 80 +----- > 2 files changed, 149 insertions(+), 79 deletions(-) > create mode 100644 Documentation/devicetree/bindings/net/ethernet-phy.yaml Updating the PHY Library section of the MAINTAINERS file to include that binding document (not sure why it was not there) would be nice.
Hi Andrew, (Sorry for not CC'ing you on this) On Thu, May 23, 2019 at 04:37:44PM +0200, Andrew Lunn wrote: > On Thu, May 23, 2019 at 11:56:45AM +0200, Maxime Ripard wrote: > > The networking PHYs have a number of available device tree properties that > > can be used in their device tree node. Add a YAML schemas for those. > > > > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> > > --- > > Documentation/devicetree/bindings/net/ethernet-phy.yaml | 148 +++++++++- > > Documentation/devicetree/bindings/net/phy.txt | 80 +----- > > 2 files changed, 149 insertions(+), 79 deletions(-) > > create mode 100644 Documentation/devicetree/bindings/net/ethernet-phy.yaml > > > > diff --git a/Documentation/devicetree/bindings/net/ethernet-phy.yaml b/Documentation/devicetree/bindings/net/ethernet-phy.yaml > > new file mode 100644 > > index 000000000000..eb79ee6db977 > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/net/ethernet-phy.yaml > > @@ -0,0 +1,148 @@ > > +# SPDX-License-Identifier: GPL-2.0 > > +%YAML 1.2 > > +--- > > +$id: http://devicetree.org/schemas/net/ethernet-phy.yaml# > > +$schema: http://devicetree.org/meta-schemas/core.yaml# > > + > > +title: Ethernet PHY Generic Binding > > + > > +maintainers: > > + - David S. Miller <davem@davemloft.net> > > + > > +properties: > > + $nodename: > > + pattern: "^ethernet-phy(@[a-f0-9])?$" > > + > > + compatible: > > + oneOf: > > I don't know the language. It is valid to have both > ethernet-phy-ieee802.3-c45 and > ethernet-phy-id[a-f0-9]{4}\\.[a-f0-9]{4}$". Does this oneOf prevent > multiple compatible strings? I haven't tested it, I will make sure it works > Also, the general case is no compatible at all. This is covered already. The description here just mentions the values available if the property is set. The required keyword a bit later lists the required property. In this case, compatible is omitted so we just list the available values for the compatible property. > > + - const: ethernet-phy-ieee802.3-c22 > > + description: PHYs that implement IEEE802.3 clause 22 > > + - const: ethernet-phy-ieee802.3-c45 > > + description: PHYs that implement IEEE802.3 clause 45 > > + - pattern: "^ethernet-phy-id[a-f0-9]{4}\\.[a-f0-9]{4}$" > > + description: > > + The first group of digits is the 16 bit Phy Identifier 1 > > + register, this is the chip vendor OUI bits 3:18. The > > + second group of digits is the Phy Identifier 2 register, > > + this is the chip vendor OUI bits 19:24, followed by 10 > > + bits of a vendor specific ID. > > Could we try to retain: > > > - If the PHY reports an incorrect ID (or none at all) then the > > - "compatible" list may contain an entry with the correct PHY ID in the > ... > > Using it is generally wrong, and that is not clear in the new text. Ok, I'll add it back. > > + > > + reg: > > + maxItems: 1 > > + minimum: 0 > > + maximum: 31 > > + description: > > + The ID number for the PHY. > > + > > + interrupts: > > + maxItems: 1 > > + > > + max-speed: > > + enum: > > + - 10 > > + - 100 > > + - 1000 > > This is outdated in the text description. Any valid speed is > supported, currently 10 - 200000, as listed in phy_setting settings(). Ack, I'll update it Thanks! Maxime -- Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Hi Florian, On Thu, May 23, 2019 at 11:16:55AM -0700, Florian Fainelli wrote: > On 5/23/19 2:56 AM, Maxime Ripard wrote: > > The networking PHYs have a number of available device tree properties that > > can be used in their device tree node. Add a YAML schemas for those. > > > > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> > > --- > > Documentation/devicetree/bindings/net/ethernet-phy.yaml | 148 +++++++++- > > Documentation/devicetree/bindings/net/phy.txt | 80 +----- > > 2 files changed, 149 insertions(+), 79 deletions(-) > > create mode 100644 Documentation/devicetree/bindings/net/ethernet-phy.yaml > > Updating the PHY Library section of the MAINTAINERS file to include that > binding document (not sure why it was not there) would be nice. Sure, I'll do it, thanks! Maxime -- Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Hi Rob, On Thu, May 23, 2019 at 09:44:51AM -0500, Rob Herring wrote: > > + reg: > > + maxItems: 1 > > + minimum: 0 > > + maximum: 31 > > min/max need to be under 'items'. I don't think these would ever be > valid if the type is an array. > > I've modified the meta-schema to catch this. Have you pushed it already? Using: reg: maxItems: 1 items: minimum: 0 maximum: 31 is creating this error when running dtbs_check ethernet-phy.yaml: properties:reg: {'maxItems': 1, 'items': {'minimum': 0, 'maximum': 31}, 'description': 'The ID number for the PHY.'} is not valid under any of the given schemas Maxime -- Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
diff --git a/Documentation/devicetree/bindings/net/ethernet-phy.yaml b/Documentation/devicetree/bindings/net/ethernet-phy.yaml new file mode 100644 index 000000000000..eb79ee6db977 --- /dev/null +++ b/Documentation/devicetree/bindings/net/ethernet-phy.yaml @@ -0,0 +1,148 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/ethernet-phy.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Ethernet PHY Generic Binding + +maintainers: + - David S. Miller <davem@davemloft.net> + +properties: + $nodename: + pattern: "^ethernet-phy(@[a-f0-9])?$" + + compatible: + oneOf: + - const: ethernet-phy-ieee802.3-c22 + description: PHYs that implement IEEE802.3 clause 22 + - const: ethernet-phy-ieee802.3-c45 + description: PHYs that implement IEEE802.3 clause 45 + - pattern: "^ethernet-phy-id[a-f0-9]{4}\\.[a-f0-9]{4}$" + description: + The first group of digits is the 16 bit Phy Identifier 1 + register, this is the chip vendor OUI bits 3:18. The + second group of digits is the Phy Identifier 2 register, + this is the chip vendor OUI bits 19:24, followed by 10 + bits of a vendor specific ID. + + reg: + maxItems: 1 + minimum: 0 + maximum: 31 + description: + The ID number for the PHY. + + interrupts: + maxItems: 1 + + max-speed: + enum: + - 10 + - 100 + - 1000 + description: + Maximum PHY supported speed in Mbits / seconds. + + broken-turn-around: + $ref: /schemas/types.yaml#definitions/flag + description: + If set, indicates the PHY device does not correctly release + the turn around line low at the end of a MDIO transaction. + + enet-phy-lane-swap: + $ref: /schemas/types.yaml#definitions/flag + description: + If set, indicates the PHY will swap the TX/RX lanes to + compensate for the board being designed with the lanes + swapped. + + eee-broken-100tx: + $ref: /schemas/types.yaml#definitions/flag + description: + Mark the corresponding energy efficient ethernet mode as + broken and request the ethernet to stop advertising it. + + eee-broken-1000t: + $ref: /schemas/types.yaml#definitions/flag + description: + Mark the corresponding energy efficient ethernet mode as + broken and request the ethernet to stop advertising it. + + eee-broken-10gt: + $ref: /schemas/types.yaml#definitions/flag + description: + Mark the corresponding energy efficient ethernet mode as + broken and request the ethernet to stop advertising it. + + eee-broken-1000kx: + $ref: /schemas/types.yaml#definitions/flag + description: + Mark the corresponding energy efficient ethernet mode as + broken and request the ethernet to stop advertising it. + + eee-broken-10gkx4: + $ref: /schemas/types.yaml#definitions/flag + description: + Mark the corresponding energy efficient ethernet mode as + broken and request the ethernet to stop advertising it. + + eee-broken-10gkr: + $ref: /schemas/types.yaml#definitions/flag + description: + Mark the corresponding energy efficient ethernet mode as + broken and request the ethernet to stop advertising it. + + phy-is-integrated: + $ref: /schemas/types.yaml#definitions/flag + description: + If set, indicates that the PHY is integrated into the same + physical package as the Ethernet MAC. If needed, muxers + should be configured to ensure the integrated PHY is + used. The absence of this property indicates the muxers + should be configured so that the external PHY is used. + + resets: + maxItems: 1 + + reset-names: + const: phy + + reset-gpios: + description: + The GPIO phandle and specifier for the PHY reset signal. + + reset-assert-us: + description: + Delay after the reset was asserted in microseconds. If this + property is missing the delay will be skipped. + + reset-deassert-us: + description: + Delay after the reset was deasserted in microseconds. If + this property is missing the delay will be skipped. + +required: + - reg + - interrupts + +examples: + - | + ethernet { + #address-cells = <1>; + #size-cells = <0>; + + ethernet-phy@0 { + compatible = "ethernet-phy-id0141.0e90", "ethernet-phy-ieee802.3-c22"; + interrupt-parent = <&PIC>; + interrupts = <35 1>; + reg = <0>; + + resets = <&rst 8>; + reset-names = "phy"; + reset-gpios = <&gpio1 4 1>; + reset-assert-us = <1000>; + reset-deassert-us = <2000>; + }; + }; diff --git a/Documentation/devicetree/bindings/net/phy.txt b/Documentation/devicetree/bindings/net/phy.txt index 9b9e5b1765dd..2399ee60caed 100644 --- a/Documentation/devicetree/bindings/net/phy.txt +++ b/Documentation/devicetree/bindings/net/phy.txt @@ -1,79 +1 @@ -PHY nodes - -Required properties: - - - interrupts : interrupt specifier for the sole interrupt. - - reg : The ID number for the phy, usually a small integer - -Optional Properties: - -- compatible: Compatible list, may contain - "ethernet-phy-ieee802.3-c22" or "ethernet-phy-ieee802.3-c45" for - PHYs that implement IEEE802.3 clause 22 or IEEE802.3 clause 45 - specifications. If neither of these are specified, the default is to - assume clause 22. - - If the PHY reports an incorrect ID (or none at all) then the - "compatible" list may contain an entry with the correct PHY ID in the - form: "ethernet-phy-idAAAA.BBBB" where - AAAA - The value of the 16 bit Phy Identifier 1 register as - 4 hex digits. This is the chip vendor OUI bits 3:18 - BBBB - The value of the 16 bit Phy Identifier 2 register as - 4 hex digits. This is the chip vendor OUI bits 19:24, - followed by 10 bits of a vendor specific ID. - - The compatible list should not contain other values than those - listed here. - -- max-speed: Maximum PHY supported speed (10, 100, 1000...) - -- broken-turn-around: If set, indicates the PHY device does not correctly - release the turn around line low at the end of a MDIO transaction. - -- enet-phy-lane-swap: If set, indicates the PHY will swap the TX/RX lanes to - compensate for the board being designed with the lanes swapped. - -- enet-phy-lane-no-swap: If set, indicates that PHY will disable swap of the - TX/RX lanes. This property allows the PHY to work correcly after e.g. wrong - bootstrap configuration caused by issues in PCB layout design. - -- eee-broken-100tx: -- eee-broken-1000t: -- eee-broken-10gt: -- eee-broken-1000kx: -- eee-broken-10gkx4: -- eee-broken-10gkr: - Mark the corresponding energy efficient ethernet mode as broken and - request the ethernet to stop advertising it. - -- phy-is-integrated: If set, indicates that the PHY is integrated into the same - physical package as the Ethernet MAC. If needed, muxers should be configured - to ensure the integrated PHY is used. The absence of this property indicates - the muxers should be configured so that the external PHY is used. - -- resets: The reset-controller phandle and specifier for the PHY reset signal. - -- reset-names: Must be "phy" for the PHY reset signal. - -- reset-gpios: The GPIO phandle and specifier for the PHY reset signal. - -- reset-assert-us: Delay after the reset was asserted in microseconds. - If this property is missing the delay will be skipped. - -- reset-deassert-us: Delay after the reset was deasserted in microseconds. - If this property is missing the delay will be skipped. - -Example: - -ethernet-phy@0 { - compatible = "ethernet-phy-id0141.0e90", "ethernet-phy-ieee802.3-c22"; - interrupt-parent = <&PIC>; - interrupts = <35 IRQ_TYPE_EDGE_RISING>; - reg = <0>; - - resets = <&rst 8>; - reset-names = "phy"; - reset-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; - reset-assert-us = <1000>; - reset-deassert-us = <2000>; -}; +This file has moved to ethernet-phy.yaml.
The networking PHYs have a number of available device tree properties that can be used in their device tree node. Add a YAML schemas for those. Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> --- Documentation/devicetree/bindings/net/ethernet-phy.yaml | 148 +++++++++- Documentation/devicetree/bindings/net/phy.txt | 80 +----- 2 files changed, 149 insertions(+), 79 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/ethernet-phy.yaml