From patchwork Sun Feb 12 12:16:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janne Grunau X-Patchwork-Id: 653021 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D910FC636D7 for ; Sun, 12 Feb 2023 12:16:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229689AbjBLMQj (ORCPT ); Sun, 12 Feb 2023 07:16:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229532AbjBLMQf (ORCPT ); Sun, 12 Feb 2023 07:16:35 -0500 Received: from soltyk.jannau.net (soltyk.jannau.net [144.76.91.90]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA4D9EFBF; Sun, 12 Feb 2023 04:16:33 -0800 (PST) Received: from robin.home.jannau.net (p579ad32f.dip0.t-ipconnect.de [87.154.211.47]) by soltyk.jannau.net (Postfix) with ESMTPSA id 9C93B26F76C; Sun, 12 Feb 2023 13:16:31 +0100 (CET) From: Janne Grunau Date: Sun, 12 Feb 2023 13:16:29 +0100 Subject: [PATCH v2 1/4] dt-bindings: net: Add network-class schema for mac-address properties MIME-Version: 1.0 Message-Id: <20230203-dt-bindings-network-class-v2-1-499686795073@jannau.net> References: <20230203-dt-bindings-network-class-v2-0-499686795073@jannau.net> In-Reply-To: <20230203-dt-bindings-network-class-v2-0-499686795073@jannau.net> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Mailing List , Kalle Valo , van Spriel , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= , Dinh Nguyen , Ley Foon Tan , Chee Nouk Phoon Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, Janne Grunau X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=4501; i=j@jannau.net; h=from:subject:message-id; bh=8HRhQ9UDUyunqEi/R8RirwwIC4gcDZhwkLZD91gnvCY=; b=owGbwMvMwCG2UNrmdq9+ahrjabUkhuQXN+ZNdPuo4jAjVC+vj0Phyu2gGx+v9zVPY4tYrfkz9 M9cH/uGjlIWBjEOBlkxRZYk7ZcdDKtrFGNqH4TBzGFlAhnCwMUpABNpF2b4n94SrMX/dfqZXJ+w v5NifxzVUI4zvSv926d3aje3mcRpU4Z/eqeCfRq8dPYu2vikp9tEy2/ZeQmBhgPH39+9ZvZf/Jg KBwA= X-Developer-Key: i=j@jannau.net; a=openpgp; fpr=8B336A6BE4E5695E89B8532B81E806F586338419 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The ethernet-controller schema specifies "mac-address" and "local-mac-address" but other network devices such as wireless network adapters use mac addresses as well. The Devicetree Specification, Release v0.3 specifies in section 4.3.1 a generic "Network Class Binding" with "address-bits", "mac-address", "local-mac-address" and "max-frame-size". This schema specifies the "address-bits" property and moves the remaining properties over from the ethernet-controller.yaml schema. The "max-frame-size" property is used to describe the maximal payload size despite its name. Keep the description from ethernet-controller specifying this property as MTU. The contradictory description in the Devicetree Specification is ignored. Signed-off-by: Janne Grunau --- Changed in v2: - restrict address-size to 48 bits for strict mac address size validation - move max-frame-size as well --- .../bindings/net/ethernet-controller.yaml | 25 +----------- .../devicetree/bindings/net/network-class.yaml | 44 ++++++++++++++++++++++ 2 files changed, 45 insertions(+), 24 deletions(-) diff --git a/Documentation/devicetree/bindings/net/ethernet-controller.yaml b/Documentation/devicetree/bindings/net/ethernet-controller.yaml index 00be387984ac..1ad66af55d77 100644 --- a/Documentation/devicetree/bindings/net/ethernet-controller.yaml +++ b/Documentation/devicetree/bindings/net/ethernet-controller.yaml @@ -17,30 +17,6 @@ properties: $ref: /schemas/types.yaml#/definitions/string description: Human readable label on a port of a box. - local-mac-address: - description: - Specifies the MAC address that was assigned to the network device. - $ref: /schemas/types.yaml#/definitions/uint8-array - minItems: 6 - maxItems: 6 - - mac-address: - description: - Specifies the MAC address that was last used by the boot - program; should be used in cases where the MAC address assigned - to the device by the boot program is different from the - local-mac-address property. - $ref: /schemas/types.yaml#/definitions/uint8-array - minItems: 6 - maxItems: 6 - - max-frame-size: - $ref: /schemas/types.yaml#/definitions/uint32 - description: - Maximum transfer unit (IEEE defined MTU), rather than the - maximum frame size (there\'s contradiction in the Devicetree - Specification). - max-speed: $ref: /schemas/types.yaml#/definitions/uint32 description: @@ -226,6 +202,7 @@ dependencies: pcs-handle-names: [pcs-handle] allOf: + - $ref: /schemas/net/network-class.yaml# - if: properties: phy-mode: diff --git a/Documentation/devicetree/bindings/net/network-class.yaml b/Documentation/devicetree/bindings/net/network-class.yaml new file mode 100644 index 000000000000..6c42c783cb03 --- /dev/null +++ b/Documentation/devicetree/bindings/net/network-class.yaml @@ -0,0 +1,44 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/network-class.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Network Class Common Properties + +maintainers: + - Devicetree Specification Mailing List + +properties: + address-bits: + description: + Specifies number of address bits required to address the device described + by this node. This property specifies number of bits in MAC address. + default: 48 + const: 48 + + local-mac-address: + description: + Specifies MAC address that was assigned to the network device described by + the node containing this property. + $ref: /schemas/types.yaml#/definitions/uint8-array + minItems: 6 + maxItems: 6 + + mac-address: + description: + Specifies the MAC address that was last used by the boot program. This + property should be used in cases where the MAC address assigned to the + device by the boot program is different from the + local-mac-address property. This property shall be used only if the value + differs from local-mac-address property value. + $ref: /schemas/types.yaml#/definitions/uint8-array + minItems: 6 + maxItems: 6 + + max-frame-size: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + Maximum transfer unit (IEEE defined MTU). + +additionalProperties: true From patchwork Sun Feb 12 12:16:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janne Grunau X-Patchwork-Id: 653395 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BD6CFC636D3 for ; Sun, 12 Feb 2023 12:16:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229657AbjBLMQg (ORCPT ); Sun, 12 Feb 2023 07:16:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60164 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229564AbjBLMQf (ORCPT ); Sun, 12 Feb 2023 07:16:35 -0500 Received: from soltyk.jannau.net (soltyk.jannau.net [144.76.91.90]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D82AEE39E; Sun, 12 Feb 2023 04:16:33 -0800 (PST) Received: from robin.home.jannau.net (p579ad32f.dip0.t-ipconnect.de [87.154.211.47]) by soltyk.jannau.net (Postfix) with ESMTPSA id 2884926F76D; Sun, 12 Feb 2023 13:16:32 +0100 (CET) From: Janne Grunau Date: Sun, 12 Feb 2023 13:16:30 +0100 Subject: [PATCH v2 2/4] dt-bindings: wireless: bcm4329-fmac: Use network-class.yaml schema MIME-Version: 1.0 Message-Id: <20230203-dt-bindings-network-class-v2-2-499686795073@jannau.net> References: <20230203-dt-bindings-network-class-v2-0-499686795073@jannau.net> In-Reply-To: <20230203-dt-bindings-network-class-v2-0-499686795073@jannau.net> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Mailing List , Kalle Valo , van Spriel , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= , Dinh Nguyen , Ley Foon Tan , Chee Nouk Phoon Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, Janne Grunau X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=1073; i=j@jannau.net; h=from:subject:message-id; bh=hIczjgZ3j0WKhMWdXkOeVhlbmC36N4y+R9jOPHgn32g=; b=owGbwMvMwCG2UNrmdq9+ahrjabUkhuQXN+Yx/fzayzud8evC3W8fuis3KKU49Tg9/vVV/pptq X5J9FSXjlIWBjEOBlkxRZYk7ZcdDKtrFGNqH4TBzGFlAhnCwMUpABMxM2VkOPZhQn/eIfUDBsd9 fS24jTMEz9/z75X7+ML73IGrjqnKDxj+e67+LX7itQnH3027Dyxiu/o1pffS6+yuaaFrHzKoxPL xMAMA X-Developer-Key: i=j@jannau.net; a=openpgp; fpr=8B336A6BE4E5695E89B8532B81E806F586338419 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The network-class schema specifies local-mac-address as used in the bcm4329-fmac device nodes of Apple silicon devices (arch/arm64/boot/dts/apple). Fixes `make dtbs_check` for those devices. Signed-off-by: Janne Grunau --- .../devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml b/Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml index fec1cc9b9a08..55b0a21acb96 100644 --- a/Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml +++ b/Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml @@ -116,11 +116,14 @@ properties: NVRAM. This would normally be filled in by the bootloader from platform configuration data. +allOf: + - $ref: /schemas/net/network-class.yaml# + required: - compatible - reg -additionalProperties: false +unevaluatedProperties: false examples: - | From patchwork Sun Feb 12 12:16:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janne Grunau X-Patchwork-Id: 653020 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03AB0C636D4 for ; Sun, 12 Feb 2023 12:16:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229680AbjBLMQi (ORCPT ); Sun, 12 Feb 2023 07:16:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229570AbjBLMQg (ORCPT ); Sun, 12 Feb 2023 07:16:36 -0500 Received: from soltyk.jannau.net (soltyk.jannau.net [144.76.91.90]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4638E10A9F; Sun, 12 Feb 2023 04:16:34 -0800 (PST) Received: from robin.home.jannau.net (p579ad32f.dip0.t-ipconnect.de [87.154.211.47]) by soltyk.jannau.net (Postfix) with ESMTPSA id A702E26F76E; Sun, 12 Feb 2023 13:16:32 +0100 (CET) From: Janne Grunau Date: Sun, 12 Feb 2023 13:16:31 +0100 Subject: [PATCH v2 3/4] dt-bindings: wireless: silabs,wfx: Use network-class.yaml MIME-Version: 1.0 Message-Id: <20230203-dt-bindings-network-class-v2-3-499686795073@jannau.net> References: <20230203-dt-bindings-network-class-v2-0-499686795073@jannau.net> In-Reply-To: <20230203-dt-bindings-network-class-v2-0-499686795073@jannau.net> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Mailing List , Kalle Valo , van Spriel , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= , Dinh Nguyen , Ley Foon Tan , Chee Nouk Phoon Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, Janne Grunau X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=1118; i=j@jannau.net; h=from:subject:message-id; bh=ovshDuNDGC464wNETrmVoRhcUISyfcSallBxPCefdv4=; b=owGbwMvMwCG2UNrmdq9+ahrjabUkhuQXN+alx3CxLI9rfcnzdlVo2Kd/120/62z43rp4tvDjA 9uXMd3i6ShlYRDjYJAVU2RJ0n7ZwbC6RjGm9kEYzBxWJpAhDFycAjCRKxcYGVo+Nn9T+74grP+U uoHg2Rdb37GsEXnLd2eN7dKEyIeLunUZ/in8fMH7j2dh5ZTtPd+P6uwXY5N/8N1Cu7LQfGfe9Lx 9elwA X-Developer-Key: i=j@jannau.net; a=openpgp; fpr=8B336A6BE4E5695E89B8532B81E806F586338419 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Instead listing local-mac-address and mac-address properties, reference network-class.yaml schema. The schema brings in constraints for the property checked during `make dtbs_check`. Signed-off-by: Janne Grunau --- Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml b/Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml index 583db5d42226..2ce50b57c096 100644 --- a/Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml +++ b/Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml @@ -72,15 +72,12 @@ properties: "Platform Data Set" in Silabs jargon). Default depends of "compatible" string. For "silabs,wf200", the default is 'wf200.pds'. - local-mac-address: true - - mac-address: true - required: - compatible - reg allOf: + - $ref: /schemas/net/network-class.yaml# - $ref: /schemas/spi/spi-peripheral-props.yaml# unevaluatedProperties: false From patchwork Sun Feb 12 12:16:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janne Grunau X-Patchwork-Id: 653393 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4417DC6FA99 for ; Sun, 12 Feb 2023 12:16:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229671AbjBLMQh (ORCPT ); Sun, 12 Feb 2023 07:16:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60172 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229463AbjBLMQf (ORCPT ); Sun, 12 Feb 2023 07:16:35 -0500 Received: from soltyk.jannau.net (soltyk.jannau.net [144.76.91.90]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84F9511673; Sun, 12 Feb 2023 04:16:34 -0800 (PST) Received: from robin.home.jannau.net (p579ad32f.dip0.t-ipconnect.de [87.154.211.47]) by soltyk.jannau.net (Postfix) with ESMTPSA id 29E4F26F76F; Sun, 12 Feb 2023 13:16:33 +0100 (CET) From: Janne Grunau Date: Sun, 12 Feb 2023 13:16:32 +0100 Subject: [PATCH v2 4/4] nios2: dts: Fix tse_mac "max-frame-size" property MIME-Version: 1.0 Message-Id: <20230203-dt-bindings-network-class-v2-4-499686795073@jannau.net> References: <20230203-dt-bindings-network-class-v2-0-499686795073@jannau.net> In-Reply-To: <20230203-dt-bindings-network-class-v2-0-499686795073@jannau.net> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Mailing List , Kalle Valo , van Spriel , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= , Dinh Nguyen , Ley Foon Tan , Chee Nouk Phoon Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, Janne Grunau X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=1609; i=j@jannau.net; h=from:subject:message-id; bh=uWSEYKB7li7fZFeyFFAr5iOwvcAG0u54TSff/HhFETY=; b=owGbwMvMwCG2UNrmdq9+ahrjabUkhuQXN+ZNYed9b6O9jTP29ZQXij7nE82O7uadl5nw7cQ57 6aoNY7qHaUsDGIcDLJiiixJ2i87GFbXKMbUPgiDmcPKBDKEgYtTACZy/C3DP4WASfu19at0E0sY FS2si9Vmb8+Q+GdmqLm8rEWK9XeSPMP/qgXTfRV6i368/r3zYfGxBxt44lbc0BFtMNL+zn3Q1j+ VGQA= X-Developer-Key: i=j@jannau.net; a=openpgp; fpr=8B336A6BE4E5695E89B8532B81E806F586338419 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The given value of 1518 seems to refer to the layer 2 ethernet frame size without 802.1Q tag. Actual use of the "max-frame-size" including in the consumer of the "altr,tse-1.0" compatible is the MTU. Fixes: 95acd4c7b69c ("nios2: Device tree support") Fixes: 61c610ec61bb ("nios2: Add Max10 device tree") Signed-off-by: Janne Grunau --- arch/nios2/boot/dts/10m50_devboard.dts | 2 +- arch/nios2/boot/dts/3c120_devboard.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/nios2/boot/dts/10m50_devboard.dts b/arch/nios2/boot/dts/10m50_devboard.dts index 56339bef3247..0e7e5b0dd685 100644 --- a/arch/nios2/boot/dts/10m50_devboard.dts +++ b/arch/nios2/boot/dts/10m50_devboard.dts @@ -97,7 +97,7 @@ rgmii_0_eth_tse_0: ethernet@400 { rx-fifo-depth = <8192>; tx-fifo-depth = <8192>; address-bits = <48>; - max-frame-size = <1518>; + max-frame-size = <1500>; local-mac-address = [00 00 00 00 00 00]; altr,has-supplementary-unicast; altr,enable-sup-addr = <1>; diff --git a/arch/nios2/boot/dts/3c120_devboard.dts b/arch/nios2/boot/dts/3c120_devboard.dts index d10fb81686c7..3ee316906379 100644 --- a/arch/nios2/boot/dts/3c120_devboard.dts +++ b/arch/nios2/boot/dts/3c120_devboard.dts @@ -106,7 +106,7 @@ tse_mac: ethernet@4000 { interrupt-names = "rx_irq", "tx_irq"; rx-fifo-depth = <8192>; tx-fifo-depth = <8192>; - max-frame-size = <1518>; + max-frame-size = <1500>; local-mac-address = [ 00 00 00 00 00 00 ]; phy-mode = "rgmii-id"; phy-handle = <&phy0>;