From patchwork Mon Jun 26 11:37:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 13292743 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8F0D8EB64DA for ; Mon, 26 Jun 2023 11:38:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=uo4pihGJnjhBCayX55QxQ7fxNmk3J8778eSDCh3DEwU=; b=k/93ioSs8H7NRl CDGxRdF3INll6p+++G1RNqIyHMdJnEGBeucGH5Whjr7nL/5OQYvV0EZwmRwzyIWG5G0Zk5GOu01EZ vXRHxKANRJGmNUmWjJfTI7izRcYq+kd6+95CcJ5EmTzghtCe6ohEv5dRWXtALqRSXuFWxSlUB1YiP h3PPqJMKCD/uFCrqstWoOVd9BLdNim0i9uD+YR6Qe2dhEdOC0fB3D8stL2Y/aPYlV4MP6ZwXPK6CP aO3PVLc8EzpisJo059GoxG4ytkcIp6vnOTe20tKtvirVj3C8wuiqQ3JMMQ7ik0QxogjXelJf4GhfJ xA12NJzE+3Pq/kcijgrQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qDkXI-00A6tB-15; Mon, 26 Jun 2023 11:37:36 +0000 Received: from mail-lf1-x12a.google.com ([2a00:1450:4864:20::12a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qDkXE-00A6rt-1v; Mon, 26 Jun 2023 11:37:34 +0000 Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-4f865f0e16cso4003492e87.3; Mon, 26 Jun 2023 04:37:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687779448; x=1690371448; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=jHKe5lG5M490XdynJa/tSmNSdNOnKPsg3CzhJJHwz24=; b=C5GlRe75uQd4OzstdlmX6YmpNA8Oqp5MN9SMk34uTEBTGxK9CPbEKj8UiayB9vrukO Ao4Oq1hg7Qnh7nar2N60o3uP67d8a9SFi2uYTEtrDLHIEy2oB0KhC7yl/M90BRDQxaYj wXbQ/Mf8vN8MOXBQmhMcJoGrnklJBtgRF2wFJvS/xX6+0xiWcV7KBQeG6IanSzzF8QcE T8G6j1mwMY/TOvItXw0vw+02zHd/9oMkuFEw34mlbAT85W7N1jh/sWmm5DkMg07ATz+Z h0MJei/GZ9oUuACNqAYdh4l0mWAQgHoMidtoAPyFUoDTK7uGpPqf6VXL2aJTdeOaX+vi pV+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687779448; x=1690371448; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=jHKe5lG5M490XdynJa/tSmNSdNOnKPsg3CzhJJHwz24=; b=bXG7vM8hzQmJ4pvI6viuxtfAQDz7VNTu97Bx0gHPCVmO27s0Ymr3yyOKGj2Lm3nZOR LJi1yptVvpw7Eo9vZbJIFRGeghhULKrd1erbBqwk5CS+VhsIl6nJ+aLOb56jCcAM8XKf rniw3Jb3tEPH+FZfVIJwy9OEFkujCOulyjOJ0pNL2MEAhTUveBziSeACWqQNcRmrYpsl +2hixG2ntiIgKVjABpD0j71G7nmKVP9fyrMZoPZ5Q6Jppdxxnj29ss7Vqxz2Yzx/iVdf DqWar67JsW/xfsThgMPp2NHaVwzn1CyMaxkSDAcrwj4cfZcN15Jcax7TFAk6VGAjdWt9 sh2A== X-Gm-Message-State: AC+VfDyQUIa9BeF7mZ7P5UZBqmLz9IAaiWLEBxAXwFb17TE1S8BnJbjZ 2ZwOTO3FEMFI3//aLTjL5rpOzuJNZfk= X-Google-Smtp-Source: ACHHUZ6Bi52qruhzhSDdUIjI8u9Fo8/QT9NApiTypTcfMPX0B4+OgUL9UMyJRN/uFTg4JMbdA9HUIA== X-Received: by 2002:a05:6512:23a4:b0:4fb:18f4:4cd4 with SMTP id c36-20020a05651223a400b004fb18f44cd4mr2195631lfv.55.1687779448264; Mon, 26 Jun 2023 04:37:28 -0700 (PDT) Received: from localhost.lan (031011218106.poznan.vectranet.pl. [31.11.218.106]) by smtp.gmail.com with ESMTPSA id y24-20020ac24478000000b004f64fb058f7sm1064349lfl.225.2023.06.26.04.37.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 04:37:27 -0700 (PDT) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: Srinivas Kandagatla , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Miquel Raynal , Christian Marangi , devicetree@vger.kernel.org, linux-mtd@lists.infradead.org, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?b?UmFmYcWC?= =?utf-8?b?IE1pxYJlY2tp?= Subject: [PATCH V2] dt-bindings: nvmem: fixed-cell: add compatible for MAC cells Date: Mon, 26 Jun 2023 13:37:16 +0200 Message-Id: <20230626113716.17674-1-zajec5@gmail.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230626_043732_655256_E87F427B X-CRM114-Status: GOOD ( 16.05 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Rafał Miłecki A lot of home routers have NVMEM fixed cells containing MAC address that need some further processing. In ~99% cases MAC needs to be: 1. Optionally parsed from ASCII format 2. Increased by a vendor-picked value There was already an attempt to design a binding for that at NVMEM device level in the past. It wasn't accepted though as it didn't really fit NVMEM device layer. The introduction of NVMEM fixed-cells layout seems to be an opportunity to provide a relevant binding in a clean way. This commit adds a *generic* compatible string: "mac-base". As always it needs to be carefully reviewed. OpenWrt project currently supports ~300 home routers that have NVMEM cell with binary-stored base MAC.T hose devices are manufactured by multiple vendors. There are TP-Link devices (76 of them), Netgear (19), D-Link (11), OpenMesh (9), EnGenius (8), GL.iNet (8), ZTE (7), Xiaomi (5), Ubiquiti (6) and more. Those devices don't share an architecture or SoC. Another 200 devices have base MAC stored in an ASCII format (not all those devices have been converted to DT though). It would be impractical to provide unique "compatible" strings for NVMEM layouts of all those devices. It seems like a valid case for allowing a generic binding instead. Even if this binding will not be sufficient for some further devices it seems to be useful enough as it is. Signed-off-by: Rafał Miłecki --- V2: Drop "mac-ascii" as length can be checked instead Fix "allOf" by adding required: [ compatible ] --- .../bindings/nvmem/layouts/fixed-cell.yaml | 26 +++++++++++++++++++ .../bindings/nvmem/layouts/fixed-layout.yaml | 12 +++++++++ .../devicetree/bindings/nvmem/nvmem.yaml | 5 +++- 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/nvmem/layouts/fixed-cell.yaml b/Documentation/devicetree/bindings/nvmem/layouts/fixed-cell.yaml index e698098450e1..036a9ed88893 100644 --- a/Documentation/devicetree/bindings/nvmem/layouts/fixed-cell.yaml +++ b/Documentation/devicetree/bindings/nvmem/layouts/fixed-cell.yaml @@ -11,6 +11,15 @@ maintainers: - Srinivas Kandagatla properties: + compatible: + oneOf: + - const: mac-base + description: > + Cell with base MAC address to be used for calculating extra relative + addresses. + It can be stored in a plain binary format (cell length 12) or as an + ASCII text like "00:11:22:33:44:55" (cell length 17). + reg: maxItems: 1 @@ -25,6 +34,23 @@ properties: description: Size in bit within the address range specified by reg. +allOf: + - if: + required: [ compatible ] + then: + if: + properties: + compatible: + contains: + const: mac-base + then: + properties: + "#nvmem-cell-cells": + description: The first argument is a MAC address offset. + const: 1 + required: + - "#nvmem-cell-cells" + required: - reg diff --git a/Documentation/devicetree/bindings/nvmem/layouts/fixed-layout.yaml b/Documentation/devicetree/bindings/nvmem/layouts/fixed-layout.yaml index c271537d0714..b3a09e8864f1 100644 --- a/Documentation/devicetree/bindings/nvmem/layouts/fixed-layout.yaml +++ b/Documentation/devicetree/bindings/nvmem/layouts/fixed-layout.yaml @@ -44,6 +44,18 @@ examples: #address-cells = <1>; #size-cells = <1>; + mac@100 { + compatible = "mac-base"; + reg = <0x100 0xc>; + #nvmem-cell-cells = <1>; + }; + + mac@110 { + compatible = "mac-base"; + reg = <0x110 0x11>; + #nvmem-cell-cells = <1>; + }; + calibration@4000 { reg = <0x4000 0x100>; }; diff --git a/Documentation/devicetree/bindings/nvmem/nvmem.yaml b/Documentation/devicetree/bindings/nvmem/nvmem.yaml index 980244100690..9f921d940142 100644 --- a/Documentation/devicetree/bindings/nvmem/nvmem.yaml +++ b/Documentation/devicetree/bindings/nvmem/nvmem.yaml @@ -49,7 +49,10 @@ properties: patternProperties: "@[0-9a-f]+(,[0-7])?$": type: object - $ref: layouts/fixed-cell.yaml + allOf: + - $ref: layouts/fixed-cell.yaml + - properties: + compatible: false deprecated: true additionalProperties: true