From patchwork Fri Oct 28 09:23:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miquel Raynal X-Patchwork-Id: 12171 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp718416wru; Fri, 28 Oct 2022 02:25:59 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6KGxVnZcwnY/5vU8yVZt9M4UcRj7fN8htRKZSFDEIuaBhIHvCF7+PyRau57de9gableg7p X-Received: by 2002:a17:90a:5e04:b0:20b:1f20:5069 with SMTP id w4-20020a17090a5e0400b0020b1f205069mr14965557pjf.126.1666949158897; Fri, 28 Oct 2022 02:25:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666949158; cv=none; d=google.com; s=arc-20160816; b=cbw24cRBlAxH+HT4DPH+H93QUSRbdX2LRwAVHv1EuUPuCPyVdXiEHYxne/FX4RkfKR pIwSa8Ki052zgcBkwXlUAo8/AQuPQwwG98Xz4Cjrc5nGb7WgtikpKzlvMwLCkhwBERra Z00bXS1yvcDh3R/UGEPCL5pVYwlK4QWz4CIiv5h8IUZVXVtsTV+A6aXPG/o44DCOABwH VlSSg1iHe1QkzFo/xQcwUg/MX/EFiAYVJuwPzkzs9TI4sZy/PRpHiY4njkCbo9rsTI7T BiBMkfECvj4EKs7Q+c1vPYBYlRYc8EM85ImxRWpvwZHiqc4lwjeqHdRj0uKTtdtkZADM +brw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=N0LdsNh6jfmS3zzQ/1xHfQe2PU60JuVsRUd6fVEbmxM=; b=KkY34HoFq7BT5vmA/90NwxZPJoNMQtoJhJacGzw6h15B8cXf2VdyUcjsDq59n1Aa9x CCE8U7C8JnUUMY26VBQS8UA/Dy/0FkNDUxXTeV10TpT29lcJ0PrFVyJxDygglm0HuKrB IBNKS7KwKguNnV6Pybv2N5FnRxEJdhUKCVbjhNUwXlybGKQ7H+SVeJI30PqxgYk6frOG V3AgjzOtegK68OAOAmN84knQBtBdbFgFR7aBR9Ogdw0yBIn2d5wdE+t8YSfQmoPqo64/ mJiAR3Fvbjvtm+Q7DcPjsDN5JdUUMOe2kVP8vbesN3V+pzwbVCGq2M6yLxtiHCCwcFgK RqEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=D0y+uY9C; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z24-20020a63b918000000b004347b49d045si4915537pge.631.2022.10.28.02.25.45; Fri, 28 Oct 2022 02:25:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=D0y+uY9C; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229871AbiJ1JYM (ORCPT + 99 others); Fri, 28 Oct 2022 05:24:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229682AbiJ1JYG (ORCPT ); Fri, 28 Oct 2022 05:24:06 -0400 Received: from relay11.mail.gandi.net (relay11.mail.gandi.net [217.70.178.231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A56B1C7135; Fri, 28 Oct 2022 02:23:51 -0700 (PDT) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id B14E4100006; Fri, 28 Oct 2022 09:23:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1666949029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=N0LdsNh6jfmS3zzQ/1xHfQe2PU60JuVsRUd6fVEbmxM=; b=D0y+uY9CbRgJcHkbTj4anF+Q3fpTaD1HgKcDQBeSwkB2QpkCnKJdxmTwn/aPVfzqSOp0fA GaKLWZmlNl3NA/sAgOWwCZcMLvCeGvmGWB8KicS7ABa9Bh3NQRNeuf30uCKPPfgue61JZY MmhuiPHYjxEHJWiNPWWWOUoKCAR8Rvd4wkxQ2lynjAszgraXCjXjQe8QSyuRmu0pp+QHcD yK82vRThI3NONBYV/s3x+7YVvm1e0MSjYZMGQzUMp12frGfWwjQv/Jdb4WXKGh/P4Wk9qi Ymu0Ob9EMIapvE9wI9NQo+/LYxkSJKfpBuDlDyKEcn7lpYSPRxiDle+NB9wGrw== From: Miquel Raynal To: Srinivas Kandagatla , , Rob Herring , Krzysztof Kozlowski , devicetree@vger.kernel.org Cc: Marcin Wojtas , Russell King , Maxime Chevallier , "David S. Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , netdev@vger.kernel.org, Robert Marko , Thomas Petazzoni , Michael Walle , Miquel Raynal Subject: [PATCH 5/5] net: mvpp2: Consider NVMEM cells as possible MAC address source Date: Fri, 28 Oct 2022 11:23:37 +0200 Message-Id: <20221028092337.822840-6-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221028092337.822840-1-miquel.raynal@bootlin.com> References: <20221028092337.822840-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747922881066703061?= X-GMAIL-MSGID: =?utf-8?q?1747922881066703061?= The ONIE standard describes the organization of tlv (type-length-value) arrays commonly stored within NVMEM devices on common networking hardware. Several drivers already make use of NVMEM cells for purposes like retrieving a default MAC address provided by the manufacturer. What made ONIE tables unusable so far was the fact that the information where "dynamically" located within the table depending on the manufacturer wishes, while Linux NVMEM support only allowed statically defined NVMEM cells. Fortunately, this limitation was eventually tackled with the introduction of discoverable cells through the use of NVMEM layouts, making it possible to extract and consistently use the content of tables like ONIE's tlv arrays. Parsing this table at runtime in order to get various information is now possible. So, because many Marvell networking switches already follow this standard, let's consider using NVMEM cells as a new valid source of information when looking for a base MAC address, which is one of the primary uses of these new fields. Indeed, manufacturers following the ONIE standard are encouraged to provide a default MAC address there, so let's eventually use it if no other MAC address has been found using the existing methods. Link: https://opencomputeproject.github.io/onie/design-spec/hw_requirements.html Signed-off-by: Miquel Raynal --- Hello, I suppose my change is safe but I don't want to break existing setups so a review on this would be welcome! drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c index eb0fb8128096..7c8c323f4411 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -6104,6 +6104,12 @@ static void mvpp2_port_copy_mac_addr(struct net_device *dev, struct mvpp2 *priv, } } + if (!of_get_mac_address(to_of_node(fwnode), hw_mac_addr)) { + *mac_from = "nvmem cell"; + eth_hw_addr_set(dev, hw_mac_addr); + return; + } + *mac_from = "random"; eth_hw_addr_random(dev); }