From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC238C4361B for ; Mon, 14 Dec 2020 14:31:49 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4FF302222B for ; Mon, 14 Dec 2020 14:31:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4FF302222B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=uNxYSvYhcsiTLBLs4ZRr/QXaT+z5bXItP7e/CpZbHyY=; b=LZIH1RlAHS2NaSRhA0JCcP9kL yg7O+BxW3O9MiEtwyR/t/hrBczgTLWM7HwhLkoqeHW83n41aSFeGUaEBvNrevbdxLvZCIyR4iuWK0 1iacPU6jSkFtd/dryt2guYRa5veTo8UiVpTjljFmMucGTE27Z0JQeg7SbSst6VLNAUx253J9jFh5W MU08siv+CKdVrCT9gZoWsp3WMwsJVF+CYSbjBw7FBIh/DouD2pdidRWyDbe1XsqrckgbHDRiNCxs3 X64GvM/DaURJ+wJJQnZ3dU0nW8roSP2WVRq/sW2ITMcNe2rkmTXDTCvH521AogB1Pk74LA/4N6D9W 4vYjZLVlw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1koorj-0003Ke-Bc; Mon, 14 Dec 2020 14:30:19 +0000 Received: from mail-ot1-f67.google.com ([209.85.210.67]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1koorf-0003Jo-Hp for linux-arm-kernel@lists.infradead.org; Mon, 14 Dec 2020 14:30:17 +0000 Received: by mail-ot1-f67.google.com with SMTP id j20so11379616otq.5 for ; Mon, 14 Dec 2020 06:30:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=0pA/mSvmB9EgoHu2eq7zYLx948s563I8a4xUkxAlwhA=; b=BX4CFtTcrN8rWf/DlFzk+6c/LDjOcUlzJuxoDYkmgksV5zD7zEZ3WEsRU7K3yHZv4/ kDw8wZkoa2Q2gnKf96f8X2/AIrWgHAqtByWfad3T8p50HqLkWve/PxZStabJAXc83Ww6 FYDWtybiyUTjPxutnssh1PY1MnHF8bUTjtIlin6xkJ4UO/VXRPL7T49dWeqTaDr4gsiz PRv0xUafyQ9QTkG5L6K5i7R/cidBZ0qxVpKtDSwMoBtDRHW/Tfz2SHJGzxc5of9I8Qwh uGFNT6bvPECvULAB0uOFKTx0fUzh4J0NXXs0Kj5Pc+A6n1suHfNwnbLoOMMgvh+goO8V FdLw== X-Gm-Message-State: AOAM533Z6BWuGVBSvMyMr92mYsmfDi6YhBmKer9vq/I3SXw2PffqtKkQ rIilevyX9rsZqggdVtYDIA== X-Google-Smtp-Source: ABdhPJyF3BeT1ifI1uzpbXtq2aJPz+F1pxOZ2AxU8NsvzFdUhauBBAPdinFoKdlP+RyZDwj0tP9CHw== X-Received: by 2002:a05:6830:20d5:: with SMTP id z21mr19730457otq.310.1607956211243; Mon, 14 Dec 2020 06:30:11 -0800 (PST) Received: from xps15 (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.gmail.com with ESMTPSA id u130sm4235378oib.53.2020.12.14.06.30.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Dec 2020 06:30:08 -0800 (PST) Received: (nullmailer pid 1876132 invoked by uid 1000); Mon, 14 Dec 2020 14:30:06 -0000 Date: Mon, 14 Dec 2020 08:30:06 -0600 From: Rob Herring To: Serge Semin Subject: Re: [PATCH 04/25] dt-bindings: net: dwmac: Refactor snps,*-config properties Message-ID: <20201214143006.GA1864564@robh.at.kernel.org> References: <20201214091616.13545-1-Sergey.Semin@baikalelectronics.ru> <20201214091616.13545-5-Sergey.Semin@baikalelectronics.ru> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201214091616.13545-5-Sergey.Semin@baikalelectronics.ru> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201214_093016_238390_58538D92 X-CRM114-Status: GOOD ( 33.74 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Alexandre Torgue , Joao Pinto , netdev@vger.kernel.org, Lars Persson , linux-stm32@st-md-mailman.stormreply.com, Johan Hovold , Maxime Ripard , Alexey Malahov , Jose Abreu , Serge Semin , Maxime Coquelin , Jakub Kicinski , Giuseppe Cavallaro , Vyacheslav Mitrofanov , "David S. Miller" , linux-arm-kernel@lists.infradead.org, Pavel Parkhomenko Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Dec 14, 2020 at 12:15:54PM +0300, Serge Semin wrote: > Currently the "snps,axi-config", "snps,mtl-rx-config" and > "snps,mtl-tx-config" properties are declared as a single phandle reference > to a node with corresponding parameters defined. That's not good for > several reasons. First of all scattering around a device tree some > particular device-specific configs with no visual relation to that device > isn't suitable from maintainability point of view. That leads to a > disturbed representation of the actual device tree mixing actual device > nodes and some vendor-specific configs. Secondly using the same configs > set for several device nodes doesn't represent well the devices structure, > since the interfaces these configs describe in hardware belong to > different devices and may actually differ. In the later case having the > configs node separated from the corresponding device nodes gets to be > even unjustified. > > So instead of having a separate DW *MAC configs nodes we suggest to > define them as sub-nodes of the device nodes, which interfaces they > actually describe. By doing so we'll make the DW *MAC nodes visually > correct describing all the aspects of the IP-core configuration. Thus > we'll be able to describe the configs sub-nodes bindings right in the > snps,dwmac.yaml file. > > Note the former "snps,axi-config", "snps,mtl-rx-config" and > "snps,mtl-tx-config" bindings have been marked as deprecated. > > Signed-off-by: Serge Semin > > --- > > Note the current DT schema tool requires the vendor-specific properties to be > defined in accordance with the schema: dtschema/meta-schemas/vendor-props.yaml > It means the property can be; > - boolean, > - string, > - defined with $ref and additional constraints, > - defined with allOf: [ $ref ] and additional constraints. > > The modification provided by this commit needs to extend that definition to > make the DT schema tool correctly parse this schema. That is we need to let > the vendors-specific properties to also accept the oneOf-based combined > sub-schema. Like this: > > --- a/dtschema/meta-schemas/vendor-props.yaml > +++ b/dtschema/meta-schemas/vendor-props.yaml > @@ -48,15 +48,24 @@ > - properties: # A property with a type and additional constraints > $ref: > pattern: "types.yaml#[\/]{0,1}definitions\/.*" > - allOf: > - items: > - - properties: > + > + if: > + not: > + required: > + - $ref > + then: > + patternProperties: > + "^(all|one)Of$": > + contains: > + properties: > $ref: > pattern: "types.yaml#[\/]{0,1}definitions\/.*" > required: > - $ref > - oneOf: > + > + anyOf: > - required: [ $ref ] > - required: [ allOf ] > + - required: [ oneOf ] > > ... > --- > .../devicetree/bindings/net/snps,dwmac.yaml | 380 +++++++++++++----- > 1 file changed, 288 insertions(+), 92 deletions(-) > > diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml > index 0dd543c6c08e..44aa88151cba 100644 > --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml > +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml > @@ -150,69 +150,251 @@ properties: > in a different mode than the PHY in order to function. > > snps,axi-config: > - $ref: /schemas/types.yaml#definitions/phandle > - description: > - AXI BUS Mode parameters. Phandle to a node that can contain the > - following properties > - * snps,lpi_en, enable Low Power Interface > - * snps,xit_frm, unlock on WoL > - * snps,wr_osr_lmt, max write outstanding req. limit > - * snps,rd_osr_lmt, max read outstanding req. limit > - * snps,kbbe, do not cross 1KiB boundary. > - * snps,blen, this is a vector of supported burst length. > - * snps,fb, fixed-burst > - * snps,mb, mixed-burst > - * snps,rb, rebuild INCRx Burst > + description: AXI BUS Mode parameters > + oneOf: > + - deprecated: true > + $ref: /schemas/types.yaml#definitions/phandle > + - type: object > + properties: Anywhere have have the same node/property string meaning 2 different things is a pain, let's not create another one. Just define a new node 'axi-config'. Or just put all the properties into the node directly. Grouping them has little purpose. > + snps,lpi_en: > + $ref: /schemas/types.yaml#definitions/flag > + description: Enable Low Power Interface > + > + snps,xit_frm: > + $ref: /schemas/types.yaml#definitions/flag > + description: Unlock on WoL > + > + snps,wr_osr_lmt: > + $ref: /schemas/types.yaml#definitions/uint32 > + description: Max write outstanding req. limit > + default: 1 > + minimum: 0 > + maximum: 15 > + > + snps,rd_osr_lmt: > + $ref: /schemas/types.yaml#definitions/uint32 > + description: Max read outstanding req. limit > + default: 1 > + minimum: 0 > + maximum: 15 > + > + snps,kbbe: > + $ref: /schemas/types.yaml#definitions/flag > + description: Do not cross 1KiB boundary > + > + snps,blen: > + $ref: /schemas/types.yaml#definitions/uint32-array > + description: A vector of supported burst lengths > + minItems: 7 > + maxItems: 7 > + items: > + enum: [256, 128, 64, 32, 16, 8, 4, 0] > + > + snps,fb: > + $ref: /schemas/types.yaml#definitions/flag > + description: Fixed-burst > + > + snps,mb: > + $ref: /schemas/types.yaml#definitions/flag > + description: Mixed-burst > + > + snps,rb: > + $ref: /schemas/types.yaml#definitions/flag > + description: Rebuild INCRx Burst > + > + additionalProperties: false > > snps,mtl-rx-config: > - $ref: /schemas/types.yaml#definitions/phandle > description: > - Multiple RX Queues parameters. Phandle to a node that can > - contain the following properties > - * snps,rx-queues-to-use, number of RX queues to be used in the > - driver > - * Choose one of these RX scheduling algorithms > - * snps,rx-sched-sp, Strict priority > - * snps,rx-sched-wsp, Weighted Strict priority > - * For each RX queue > - * Choose one of these modes > - * snps,dcb-algorithm, Queue to be enabled as DCB > - * snps,avb-algorithm, Queue to be enabled as AVB > - * snps,map-to-dma-channel, Channel to map > - * Specifiy specific packet routing > - * snps,route-avcp, AV Untagged Control packets > - * snps,route-ptp, PTP Packets > - * snps,route-dcbcp, DCB Control Packets > - * snps,route-up, Untagged Packets > - * snps,route-multi-broad, Multicast & Broadcast Packets > - * snps,priority, RX queue priority (Range 0x0 to 0xF) > + Multiple RX Queues parameters > + oneOf: > + - deprecated: true > + $ref: /schemas/types.yaml#definitions/phandle > + - type: object > + properties: > + snps,rx-queues-to-use: > + $ref: /schemas/types.yaml#definitions/uint32 > + description: Number of RX queues to be used in the driver > + default: 1 > + minimum: 1 > + > + patternProperties: > + "^snps,rx-sched-(sp|wsp)$": > + $ref: /schemas/types.yaml#definitions/flag > + description: Strict/Weighted Strict RX scheduling priority > + > + "^queue[0-9]$": > + type: object > + description: Each RX Queue parameters > + > + properties: > + snps,map-to-dma-channel: > + $ref: /schemas/types.yaml#definitions/uint32 > + description: DMA channel to map > + > + snps,priority: > + $ref: /schemas/types.yaml#definitions/uint32 > + description: RX queue priority > + minimum: 0 > + maximum: 15 > + > + patternProperties: > + "^snps,(dcb|avb)-algorithm$": > + $ref: /schemas/types.yaml#definitions/flag > + description: Enable Queue as DCB/AVB > + > + "^snps,route-(avcp|ptp|dcbcp|up|multi-broad)$": > + $ref: /schemas/types.yaml#definitions/flag > + description: > + AV Untagged/PTP/DCB Control/Untagged/Multicast & Broadcast > + packets routing respectively. > + > + additionalProperties: false > + > + # Choose only one of the Queue modes and the packets routing > + allOf: > + - not: > + required: > + - snps,dcb-algorithm > + - snps,avb-algorithm > + - oneOf: > + - required: > + - snps,route-avcp > + - required: > + - snps,route-ptp > + - required: > + - snps,route-dcbcp > + - required: > + - snps,route-up > + - required: > + - snps,route-multi-broad > + - not: > + anyOf: > + - required: > + - snps,route-avcp > + - required: > + - snps,route-ptp > + - required: > + - snps,route-dcbcp > + - required: > + - snps,route-up > + - required: > + - snps,route-multi-broad > + > + additionalProperties: false > + > + # Choose one of the RX scheduling algorithms > + not: > + required: > + - snps,rx-sched-sp > + - snps,rx-sched-wsp > > snps,mtl-tx-config: > - $ref: /schemas/types.yaml#definitions/phandle > description: > - Multiple TX Queues parameters. Phandle to a node that can > - contain the following properties > - * snps,tx-queues-to-use, number of TX queues to be used in the > - driver > - * Choose one of these TX scheduling algorithms > - * snps,tx-sched-wrr, Weighted Round Robin > - * snps,tx-sched-wfq, Weighted Fair Queuing > - * snps,tx-sched-dwrr, Deficit Weighted Round Robin > - * snps,tx-sched-sp, Strict priority > - * For each TX queue > - * snps,weight, TX queue weight (if using a DCB weight > - algorithm) > - * Choose one of these modes > - * snps,dcb-algorithm, TX queue will be working in DCB > - * snps,avb-algorithm, TX queue will be working in AVB > - [Attention] Queue 0 is reserved for legacy traffic > - and so no AVB is available in this queue. > - * Configure Credit Base Shaper (if AVB Mode selected) > - * snps,send_slope, enable Low Power Interface > - * snps,idle_slope, unlock on WoL > - * snps,high_credit, max write outstanding req. limit > - * snps,low_credit, max read outstanding req. limit > - * snps,priority, TX queue priority (Range 0x0 to 0xF) > + Multiple TX Queues parameters > + oneOf: > + - deprecated: true > + $ref: /schemas/types.yaml#definitions/phandle > + - type: object > + properties: > + snps,tx-queues-to-use: > + $ref: /schemas/types.yaml#definitions/uint32 > + description: Number of TX queues to be used in the driver > + default: 1 > + minimum: 1 > + > + patternProperties: > + "^snps,tx-sched-(wrr|wfq|dwrr|sp)$": > + $ref: /schemas/types.yaml#definitions/flag > + description: > + Weighted Round Robin, Weighted Fair Queuing, > + Deficit Weighted Round Robin or Strict TX scheduling priority. > + > + "^queue[0-9]$": > + type: object > + description: Each TX Queue parameters > + > + properties: > + snps,priority: > + $ref: /schemas/types.yaml#definitions/uint32 > + description: TX queue priority > + minimum: 0 > + maximum: 15 > + > + snps,weight: > + $ref: /schemas/types.yaml#definitions/uint32 > + description: TX queue weight (if using a DCB weight algorithm) > + minimum: 0 > + maximum: 0x1FFFFF > + > + snps,send_slope: > + $ref: /schemas/types.yaml#definitions/uint32 > + description: Enable Low Power Interface > + minimum: 0 > + maximum: 0x3FFF > + > + snps,idle_slope: > + $ref: /schemas/types.yaml#definitions/uint32 > + description: Unlock on WoL > + minimum: 0 > + maximum: 0x1FFFFF > + > + snps,high_credit: > + $ref: /schemas/types.yaml#definitions/uint32 > + description: Max write outstanding req. limit > + minimum: 0 > + maximum: 0x1FFFFFFF > + > + snps,low_credit: > + $ref: /schemas/types.yaml#definitions/uint32 > + description: Max read outstanding req. limit > + minimum: 0 > + maximum: 0x1FFFFFFF > + > + patternProperties: > + "^snps,(dcb|avb)-algorithm$": > + $ref: /schemas/types.yaml#definitions/flag > + description: > + Enable Queue as DCB/AVB. Note Queue 0 is reserved for legacy > + traffic and so no AVB is available in this queue. > + > + additionalProperties: false > + > + # Choose only one of the Queue modes > + not: > + required: > + - snps,dcb-algorithm > + - snps,avb-algorithm > + > + # Credit Base Shaper is configurable for AVB Mode only > + dependencies: > + snps,send_slope: ["snps,avb-algorithm"] > + snps,idle_slope: ["snps,avb-algorithm"] > + snps,high_credit: ["snps,avb-algorithm"] > + snps,low_credit: ["snps,avb-algorithm"] > + > + additionalProperties: false > + > + # Choose one of the TX scheduling algorithms > + oneOf: > + - required: > + - snps,tx-sched-wrr > + - required: > + - snps,tx-sched-wfq > + - required: > + - snps,tx-sched-dwrr > + - required: > + - snps,tx-sched-sp > + - not: > + anyOf: > + - required: > + - snps,tx-sched-wrr > + - required: > + - snps,tx-sched-wfq > + - required: > + - snps,tx-sched-dwrr > + - required: > + - snps,tx-sched-sp > > snps,reset-gpio: > deprecated: true > @@ -342,41 +524,6 @@ additionalProperties: true > > examples: > - | > - stmmac_axi_setup: stmmac-axi-config { > - snps,wr_osr_lmt = <0xf>; > - snps,rd_osr_lmt = <0xf>; > - snps,blen = <256 128 64 32 0 0 0>; > - }; > - > - mtl_rx_setup: rx-queues-config { > - snps,rx-queues-to-use = <1>; > - snps,rx-sched-sp; > - queue0 { > - snps,dcb-algorithm; > - snps,map-to-dma-channel = <0x0>; > - snps,priority = <0x0>; > - }; > - }; > - > - mtl_tx_setup: tx-queues-config { > - snps,tx-queues-to-use = <2>; > - snps,tx-sched-wrr; > - queue0 { > - snps,weight = <0x10>; > - snps,dcb-algorithm; > - snps,priority = <0x0>; > - }; > - > - queue1 { > - snps,avb-algorithm; > - snps,send_slope = <0x1000>; > - snps,idle_slope = <0x1000>; > - snps,high_credit = <0x3E800>; > - snps,low_credit = <0xFFC18000>; > - snps,priority = <0x1>; > - }; > - }; > - > gmac0: ethernet@e0800000 { > compatible = "snps,dwxgmac-2.10", "snps,dwxgmac"; > reg = <0xe0800000 0x8000>; > @@ -404,6 +551,55 @@ examples: > }; > }; > }; > + - | > + gmac1: ethernet@f8010000 { > + compatible = "snps,dwmac-4.10a", "snps,dwmac"; > + reg = <0xf8010000 0x4000>; > + interrupts = <0 98 4>; > + interrupt-names = "macirq"; > + clock-names = "stmmaceth", "ptp_ref"; > + clocks = <&clock 4>, <&clock 5>; > + phy-mode = "rgmii"; > + snps,txpbl = <8>; > + snps,rxpbl = <2>; > + snps,aal; > + snps,tso; > + > + snps,axi-config { > + snps,wr_osr_lmt = <0xf>; > + snps,rd_osr_lmt = <0xf>; > + snps,blen = <256 128 64 32 0 0 0>; > + }; > + > + snps,mtl-rx-config { > + snps,rx-queues-to-use = <1>; > + snps,rx-sched-sp; > + queue0 { > + snps,dcb-algorithm; > + snps,map-to-dma-channel = <0x0>; > + snps,priority = <0x0>; > + }; > + }; > + > + snps,mtl-tx-config { > + snps,tx-queues-to-use = <2>; > + snps,tx-sched-wrr; > + queue0 { > + snps,weight = <0x10>; > + snps,dcb-algorithm; > + snps,priority = <0x0>; > + }; > + > + queue1 { > + snps,avb-algorithm; > + snps,send_slope = <0x1000>; > + snps,idle_slope = <0x1000>; > + snps,high_credit = <0x3E800>; > + snps,low_credit = <0xFFC18000>; > + snps,priority = <0x1>; > + }; > + }; > + }; > > # FIXME: We should set it, but it would report all the generic > # properties as additional properties. > -- > 2.29.2 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel