From patchwork Fri Feb 3 13:56:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janne Grunau X-Patchwork-Id: 13127696 X-Patchwork-Delegate: johannes@sipsolutions.net 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 E19E5C636D6 for ; Fri, 3 Feb 2023 14:16:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233782AbjBCOQw (ORCPT ); Fri, 3 Feb 2023 09:16:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233122AbjBCOQf (ORCPT ); Fri, 3 Feb 2023 09:16:35 -0500 X-Greylist: delayed 606 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Fri, 03 Feb 2023 06:15:53 PST Received: from soltyk.jannau.net (soltyk.jannau.net [144.76.91.90]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67DA41DBAC; Fri, 3 Feb 2023 06:15:52 -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 7C41D26F703; Fri, 3 Feb 2023 14:56:33 +0100 (CET) From: Janne Grunau Date: Fri, 03 Feb 2023 14:56:26 +0100 Subject: [PATCH RFC 1/3] dt-bindings: net: Add network-class schema for mac-address properties MIME-Version: 1.0 Message-Id: <20230203-dt-bindings-network-class-v1-1-452e0375200d@jannau.net> References: <20230203-dt-bindings-network-class-v1-0-452e0375200d@jannau.net> In-Reply-To: <20230203-dt-bindings-network-class-v1-0-452e0375200d@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=?= 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=3851; i=j@jannau.net; h=from:subject:message-id; bh=yMGAL+QzO91nZgA/hAW/ks707rvfOrRSu4uh4kEKZwQ=; b=owGbwMvMwCG2UNrmdq9+ahrjabUkhuS7QhO4FF7sYJDV3GLdWfh7dun71QFHf+jfrf33UudGp PnUlB0dHaUsDGIcDLJiiixJ2i87GFbXKMbUPgiDmcPKBDKEgYtTACayl5nhnyJbH3u9c8bJlHuP fh3J96zhubFS/EZsnV+e3vPQDdk7bjMyzOy8skp+1bkdMy/GvJzwcEX0aQ1jbcfwBY/ZHhZcOap jzQ0A X-Developer-Key: i=j@jannau.net; a=openpgp; fpr=8B336A6BE4E5695E89B8532B81E806F586338419 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@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 "local-mac-address" and "mac-address" over from ethernet-controller.yaml. The schema currently does not restrict MAC address size based on address-bits. Signed-off-by: Janne Grunau --- .../bindings/net/ethernet-controller.yaml | 18 +--------- .../devicetree/bindings/net/network-class.yaml | 40 ++++++++++++++++++++++ 2 files changed, 41 insertions(+), 17 deletions(-) diff --git a/Documentation/devicetree/bindings/net/ethernet-controller.yaml b/Documentation/devicetree/bindings/net/ethernet-controller.yaml index 00be387984ac..a5f6a09dfdea 100644 --- a/Documentation/devicetree/bindings/net/ethernet-controller.yaml +++ b/Documentation/devicetree/bindings/net/ethernet-controller.yaml @@ -17,23 +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: @@ -226,6 +209,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..676aec1c458e --- /dev/null +++ b/Documentation/devicetree/bindings/net/network-class.yaml @@ -0,0 +1,40 @@ +# 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 Bindings + +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. + If unspecified, the default value is 48. + default: 48 + enum: [48, 64] + + 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: 8 + + 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: 8 + +additionalProperties: true From patchwork Fri Feb 3 13:56:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janne Grunau X-Patchwork-Id: 13127710 X-Patchwork-Delegate: kvalo@adurom.com 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 284D3C636D6 for ; Fri, 3 Feb 2023 14:25:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232445AbjBCOZr (ORCPT ); Fri, 3 Feb 2023 09:25:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230056AbjBCOZq (ORCPT ); Fri, 3 Feb 2023 09:25:46 -0500 Received: from soltyk.jannau.net (soltyk.jannau.net [144.76.91.90]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4072C6278D; Fri, 3 Feb 2023 06:25:45 -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 0133826F704; Fri, 3 Feb 2023 14:56:33 +0100 (CET) From: Janne Grunau Date: Fri, 03 Feb 2023 14:56:27 +0100 Subject: [PATCH RFC 2/3] dt-bindings: wireless: bcm4329-fmac: Use network-class.yaml schema MIME-Version: 1.0 Message-Id: <20230203-dt-bindings-network-class-v1-2-452e0375200d@jannau.net> References: <20230203-dt-bindings-network-class-v1-0-452e0375200d@jannau.net> In-Reply-To: <20230203-dt-bindings-network-class-v1-0-452e0375200d@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=?= 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+ahrjabUkhuS7QhO4fPPWehkeKeScrxe+LtBjz/xSpw/ZS/7fyJIP6 rNcGMndUcrCIMbBICumyJKk/bKDYXWNYkztgzCYOaxMIEMYuDgFYCJtBxkZWhfvzUtOlPz4+q9J sPry1dJtP3IE9N5Ilc+uuLbQ4BvnWqAKteccIQb28jst3shlHDpWfULjPjcvv/89fg9Hl97GH1w A X-Developer-Key: i=j@jannau.net; a=openpgp; fpr=8B336A6BE4E5695E89B8532B81E806F586338419 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@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 Fri Feb 3 13:56:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janne Grunau X-Patchwork-Id: 13127695 X-Patchwork-Delegate: kvalo@adurom.com 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 0DAE9C64EC4 for ; Fri, 3 Feb 2023 14:16:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233823AbjBCOQx (ORCPT ); Fri, 3 Feb 2023 09:16:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232871AbjBCOQf (ORCPT ); Fri, 3 Feb 2023 09:16:35 -0500 Received: from soltyk.jannau.net (soltyk.jannau.net [144.76.91.90]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 689E71E292; Fri, 3 Feb 2023 06:15:52 -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 69B0C26F705; Fri, 3 Feb 2023 14:56:34 +0100 (CET) From: Janne Grunau Date: Fri, 03 Feb 2023 14:56:28 +0100 Subject: [PATCH RFC 3/3] dt-bindings: wireless: silabs,wfx: Use network-class.yaml MIME-Version: 1.0 Message-Id: <20230203-dt-bindings-network-class-v1-3-452e0375200d@jannau.net> References: <20230203-dt-bindings-network-class-v1-0-452e0375200d@jannau.net> In-Reply-To: <20230203-dt-bindings-network-class-v1-0-452e0375200d@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=?= 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+ahrjabUkhuS7QhOy9Zrt/ltu1Wy+49587t9Hpdrn/u5+ZZsyE67X3 FhyVEe+o5SFQYyDQVZMkSVJ+2UHw+oaxZjaB2Ewc1iZQIYwcHEKwETMPzIybG6xaS/Y62gZKpC4 6eA33uAl4alrQ7d4X9sXF+b0OnzRbkaGdz3PZutbz31cU/VTYf+bsFUht/az9jxa9zx2Qb/Nl4+ 9rAA= X-Developer-Key: i=j@jannau.net; a=openpgp; fpr=8B336A6BE4E5695E89B8532B81E806F586338419 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@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