From patchwork Wed Jul 18 16:10:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10532799 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E1582601D2 for ; Wed, 18 Jul 2018 16:11:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D1FA8251F9 for ; Wed, 18 Jul 2018 16:11:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C62C828459; Wed, 18 Jul 2018 16:11:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 074DE251F9 for ; Wed, 18 Jul 2018 16:11:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=Xr4hL5p1ghdXgLmE8hY91yAr3IhZqzeadCPIAfGvw5U=; b=fWEzPq3nWwhRtz5S3meP6CrvfM vml+doDNyQ7Ong7df44QcTGMLJKM0+eug9Q0Gk3NAZuyTst517WkUWN/6gWLg9QHLrVWJYhWZxz+u X/VIW5fm0rG6/5/wsTHf0krWASLXEMgrztfHktGWCNR915ykcMIC38Jsfv75r1uhSeBhfa1iizQBP wpMi40LxnDoCNtyILkq7p/kLFuSIYgDbKX/ue0TrA4qsa27QQzNiEbADqjWWqD7vxf6vPEbnh/7eq ft+DGgC+AXApodEEORY/IgoyQqZOaVNpGxODI1oFw358h/qgbCxCtiItB2MpVM06zbzZHNQVI9FsY UIgdNQlg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1ffp3M-0003oJ-FV; Wed, 18 Jul 2018 16:11:48 +0000 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1ffp2Z-0002mD-IV for linux-arm-kernel@lists.infradead.org; Wed, 18 Jul 2018 16:11:02 +0000 Received: by mail-wm0-x241.google.com with SMTP id v25-v6so3371545wmc.0 for ; Wed, 18 Jul 2018 09:10:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UI9KTymoEQZqQnq+XDW6aBlMZfkVrCAcmaUDPOUsmDI=; b=pguzGXezdMo+nCfj61cb9cSQDJqpYDOA2Gm52xVOTudW90q76PH+oziuivmWzBxLZE wtA1jQ6Bk6uQRqzgzsCvt6VJc+tYlIgj2iihBaSg+0+LI9R/DlcymyHnghikJdhwETRw xR7fsF4k8WOglmZibZCTOzoTfu2sV9GGzcFqznTMhcngd2LKH248xBwGdMx6i5qEa3EV jcCVbwn7C5iOzkxffP2dGUHTzarnYExs7HWv8xVL221UYVL53bQDeTcC0RLOHgbrdrcd acAYPAWGHFQv5Dg0u4CNkmnHaHE9PiL8OdGnxH/JT8/LKlPPsyN30iMUG4uANiumViy3 Ub9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=UI9KTymoEQZqQnq+XDW6aBlMZfkVrCAcmaUDPOUsmDI=; b=UszAHbB5yVVAZu6APhX31eDcFdL42e7HGzFnSyCoimCt2neb6ghWnfckzaluEnsyrp EpD/akdgpPuWjSvy91c6CjBQnCbKqpIC05bSB71Ew4o6Up49VY78di3RvRWLW1+0/jZ+ YceKy3kdcq8Id7HlqXojUMSBAjDD7f4SVd2oa1c0OJa2O1YXR+kzvLkB74aB1AS1GhS4 hTlskL64ZTDCPI3Bw3hgTMAFww0kQONJSDbxezHx0R1W6TguD40APs0FuKWCLD8STWyl 4CNtel9No0FWrjATswKjkO7qmGj9/Q80nKG8BTEoVBmWElns+cnmY7BHEo4PnnJMSghU 6uqg== X-Gm-Message-State: AOUpUlHr/5q5eMJeHca3B8L3sKTMyi7jgUdYr0GyUdLVtu0tK2Wbxx2E 0eXSwhvsLZSVMwecmItMEeyDcQ== X-Google-Smtp-Source: AAOMgpcwQPB1DFnur4NqIP4uqwTLePGwa5l7iBSUGa11B1GdVBq0tO/YH/N5apraJ12RGysmcl6whw== X-Received: by 2002:a1c:838a:: with SMTP id f132-v6mr2074786wmd.127.1531930247866; Wed, 18 Jul 2018 09:10:47 -0700 (PDT) Received: from brgl-bgdev.home ([2a01:cb1d:af:5b00:e837:b8d5:48c1:571b]) by smtp.gmail.com with ESMTPSA id v185-v6sm2847803wme.30.2018.07.18.09.10.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Jul 2018 09:10:47 -0700 (PDT) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Russell King , Grygorii Strashko , "David S . Miller" , Srinivas Kandagatla , Lukas Wunner , Rob Herring , Florian Fainelli , Dan Carpenter , Ivan Khoronzhuk , David Lechner , Greg Kroah-Hartman , Andrew Lunn Subject: [PATCH 4/5] net: add support for nvmem to eth_platform_get_mac_address() Date: Wed, 18 Jul 2018 18:10:34 +0200 Message-Id: <20180718161035.7005-5-brgl@bgdev.pl> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180718161035.7005-1-brgl@bgdev.pl> References: <20180718161035.7005-1-brgl@bgdev.pl> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180718_091059_763960_8B1E4CA7 X-CRM114-Status: GOOD ( 16.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: netdev@vger.kernel.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Bartosz Golaszewski MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski Many non-DT platforms read the MAC address from EEPROM. Usually it's either done with callbacks defined in board files or from SoC-specific ethernet drivers. In order to generalize this, try to read the MAC from nvmem in eth_platform_get_mac_address() using a standard lookup name: "mac-address". Signed-off-by: Bartosz Golaszewski --- net/ethernet/eth.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index 6b64586fd2af..adf5bd03851f 100644 --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c @@ -54,6 +54,7 @@ #include #include #include +#include #include #include #include @@ -530,7 +531,10 @@ int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr) struct device_node *dp = dev_is_pci(dev) ? pci_device_to_OF_node(to_pci_dev(dev)) : dev->of_node; const unsigned char *addr = NULL; + unsigned char addrbuf[ETH_ALEN]; + struct nvmem_cell *nvmem; const char *from = NULL; + size_t alen; if (dp) { addr = of_get_mac_address(dp); @@ -544,6 +548,31 @@ int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr) from = "arch callback"; } + if (!addr) { + nvmem = nvmem_cell_get(dev, "mac-address"); + if (IS_ERR(nvmem) && PTR_ERR(nvmem) == -EPROBE_DEFER) + /* We may have a lookup registered for MAC address but + * the corresponding nvmem provider hasn't been + * registered yet. + */ + return -EPROBE_DEFER; + + if (!IS_ERR(nvmem)) { + addr = nvmem_cell_read(nvmem, &alen); + if (!IS_ERR(addr)) { + from = "nvmem"; + /* Don't use ether_addr_copy() in case we + * didn't get the right size. + */ + memcpy(addrbuf, addr, alen); + kfree(addr); + addr = addrbuf; + } + + nvmem_cell_put(nvmem); + } + } + if (!addr || !is_valid_ether_addr(addr)) return -ENODEV;