lkml.org 
[lkml]   [2020]   [Dec]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 03/25] dt-bindings: net: dwmac: Fix the TSO property declaration
On Mon, Dec 14, 2020 at 12:15:53PM +0300, Serge Semin wrote:
> Indeed the STMMAC driver doesn't take the vendor-specific compatible
> string into account to parse the "snps,tso" boolean property. It just
> makes sure the node is compatible with DW MAC 4.x, 5.x and DW xGMAC
> IP-cores. Fix the conditional statement so the TSO-property would be
> evaluated for the compatibles having the corresponding IP-core version.
>
> While at it move the whole allOf-block from the tail of the binding file
> to the head of it, as it's normally done in the most of the DT schemas.
>
> Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru>
>
> ---
>
> Note this won't break the bindings description, since the "snps,tso"
> property isn't parsed by the Allwinner SunX GMAC glue driver, but only
> by the generic platform DT-parser.

But still should be valid for Allwinner?

> ---
> .../devicetree/bindings/net/snps,dwmac.yaml | 52 +++++++++----------
> 1 file changed, 24 insertions(+), 28 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> index e084fbbf976e..0dd543c6c08e 100644
> --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> @@ -37,6 +37,30 @@ select:
> required:
> - compatible
>
> +allOf:
> + - $ref: "ethernet-controller.yaml#"
> + - if:
> + properties:
> + compatible:
> + contains:
> + enum:
> + - snps,dwmac-4.00
> + - snps,dwmac-4.10a
> + - snps,dwmac-4.20a
> + - snps,dwmac-5.10a
> + - snps,dwxgmac
> + - snps,dwxgmac-2.10
> +
> + required:
> + - compatible
> + then:
> + properties:
> + snps,tso:
> + $ref: /schemas/types.yaml#definitions/flag
> + description:
> + Enables the TSO feature otherwise it will be managed by
> + MAC HW capability register.

BTW, I prefer that properties are defined unconditionally, and then
restricted in conditional schemas (or ones that include this schema).

> +
> properties:
>
> # We need to include all the compatibles from schemas that will
> @@ -314,34 +338,6 @@ dependencies:
> snps,reset-active-low: ["snps,reset-gpio"]
> snps,reset-delay-us: ["snps,reset-gpio"]
>
> -allOf:
> - - $ref: "ethernet-controller.yaml#"
> - - if:
> - properties:
> - compatible:
> - contains:
> - enum:
> - - allwinner,sun7i-a20-gmac

This does not have a fallback, so snps,tso is no longer validated. I
didn't check the rest.

> - - allwinner,sun8i-a83t-emac
> - - allwinner,sun8i-h3-emac
> - - allwinner,sun8i-r40-emac
> - - allwinner,sun8i-v3s-emac
> - - allwinner,sun50i-a64-emac
> - - snps,dwmac-4.00
> - - snps,dwmac-4.10a
> - - snps,dwmac-4.20a
> - - snps,dwxgmac
> - - snps,dwxgmac-2.10
> - - st,spear600-gmac
> -
> - then:
> - properties:
> - snps,tso:
> - $ref: /schemas/types.yaml#definitions/flag
> - description:
> - Enables the TSO feature otherwise it will be managed by
> - MAC HW capability register.
> -
> additionalProperties: true
>
> examples:
> --
> 2.29.2
>

\
 
 \ /
  Last update: 2020-12-15 18:28    [W:0.351 / U:0.708 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site