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=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 59DF1C43219 for ; Fri, 26 Apr 2019 23:07:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2FFCA215EA for ; Fri, 26 Apr 2019 23:07:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727205AbfDZXH2 (ORCPT ); Fri, 26 Apr 2019 19:07:28 -0400 Received: from smtp-out.xnet.cz ([178.217.244.18]:24917 "EHLO smtp-out.xnet.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727008AbfDZXH1 (ORCPT ); Fri, 26 Apr 2019 19:07:27 -0400 Received: from meh.true.cz (meh.true.cz [108.61.167.218]) (Authenticated sender: petr@true.cz) by smtp-out.xnet.cz (Postfix) with ESMTPSA id 32E4136B9; Sat, 27 Apr 2019 01:07:24 +0200 (CEST) Received: by meh.true.cz (OpenSMTPD) with ESMTP id 3b2ac3a4; Sat, 27 Apr 2019 01:07:22 +0200 (CEST) From: =?UTF-8?q?Petr=20=C5=A0tetiar?= To: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Andrew Lunn , Florian Fainelli , Heiner Kallweit , Rob Herring , Frank Rowand Cc: Srinivas Kandagatla , Maxime Ripard , Alban Bedel , =?UTF-8?q?Petr=20=C5=A0tetiar?= , Felix Fietkau , John Crispin Subject: [PATCH 1/4] of_net: Add NVMEM support to of_get_mac_address Date: Sat, 27 Apr 2019 01:06:39 +0200 Message-Id: <1556320002-26213-2-git-send-email-ynezz@true.cz> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1556320002-26213-1-git-send-email-ynezz@true.cz> References: <1556320002-26213-1-git-send-email-ynezz@true.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Many embedded devices have information such as MAC addresses stored inside NVMEMs like EEPROMs and so on. Currently there are only two drivers in the tree which benefit from NVMEM bindings. Adding support for NVMEM into every other driver would mean adding a lot of repetitive code. This patch allows us to configure MAC addresses in various devices like ethernet and wireless adapters directly from of_get_mac_address, which is already used by almost every driver in the tree. Predecessor of this patch which used directly MTD layer has originated in OpenWrt some time ago and supports already about 497 use cases in 357 device tree files. Cc: Alban Bedel Signed-off-by: Felix Fietkau Signed-off-by: John Crispin Signed-off-by: Petr Štetiar --- drivers/of/of_net.c | 48 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c index d820f3e..a3d6773 100644 --- a/drivers/of/of_net.c +++ b/drivers/of/of_net.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include @@ -47,12 +48,45 @@ static const void *of_get_mac_addr(struct device_node *np, const char *name) return NULL; } +static const void *of_get_mac_addr_nvmem(struct device_node *np) +{ + int r; + u8 mac[ETH_ALEN]; + struct property *pp; + struct platform_device *pdev = of_find_device_by_node(np); + + if (!pdev) + return NULL; + + r = nvmem_get_mac_address(&pdev->dev, &mac); + if (r < 0) + return NULL; + + pp = kzalloc(sizeof(*pp), GFP_KERNEL); + if (!pp) + return NULL; + + pp->name = "nvmem-mac-address"; + pp->length = ETH_ALEN; + pp->value = kmemdup(mac, ETH_ALEN, GFP_KERNEL); + if (!pp->value || of_add_property(np, pp)) + goto free; + + return pp->value; +free: + kfree(pp->value); + kfree(pp); + + return NULL; +} + /** - * Search the device tree for the best MAC address to use. 'mac-address' is - * checked first, because that is supposed to contain to "most recent" MAC - * address. If that isn't set, then 'local-mac-address' is checked next, - * because that is the default address. If that isn't set, then the obsolete - * 'address' is checked, just in case we're using an old device tree. + * Search the device tree for the best MAC address to use. Check NVME first as + * it should contain the proper MAC address, then 'mac-address' is checked + * next, because that is supposed to contain to "most recent" MAC address. If + * that isn't set, then 'local-mac-address' is checked next, because that is + * the default address. If that isn't set, then the obsolete 'address' is + * checked, just in case we're using an old device tree. * * Note that the 'address' property is supposed to contain a virtual address of * the register set, but some DTS files have redefined that property to be the @@ -69,6 +103,10 @@ const void *of_get_mac_address(struct device_node *np) { const void *addr; + addr = of_get_mac_addr_nvmem(np); + if (addr) + return addr; + addr = of_get_mac_addr(np, "mac-address"); if (addr) return addr; -- 1.9.1