From patchwork Thu Jan 18 12:31:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Wojtas X-Patchwork-Id: 862845 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=semihalf-com.20150623.gappssmtp.com header.i=@semihalf-com.20150623.gappssmtp.com header.b="qsDFeqtT"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zMk0j0thtz9s81 for ; Thu, 18 Jan 2018 23:34:13 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932169AbeARMcD (ORCPT ); Thu, 18 Jan 2018 07:32:03 -0500 Received: from mail-lf0-f65.google.com ([209.85.215.65]:41387 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755706AbeARMcA (ORCPT ); Thu, 18 Jan 2018 07:32:00 -0500 Received: by mail-lf0-f65.google.com with SMTP id f136so4967219lff.8 for ; Thu, 18 Jan 2018 04:31:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9lEUTjcdMWUCyftnMB+ar2Dv5pEYc7sQr93gJyE7pnU=; b=qsDFeqtTAi4EHyrwW0x+BAT1HUtLMr4HR8h3sv+hVhbWgyZI61/5Y1Ssw1spYcAdZF t5+E540c0lsArxVWoy35m2qlajMN0yfAKk1MwxJcCNBWhtHEVTpzjIJ5giAbikvhcLtK /UxIP8Ln93spuhp3Lnw1O5ILjQEmP0bO5cTJBf2UKr7wTQCG1+MF/h5Gk/S/Nros3r28 yCSaE3ESThlHmaLRsoZHXYPuh9SDyxyeQPM9ltX/tX2tI16NLZfP7pcpg3g6fxKE0s3s 1kVXVwLdiEjvW589PNt+V7Te7IPBLwiVmrqQhxjG52AAz8Muu1EdSbRq7uNRx8Ct1E7m yl5g== 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=9lEUTjcdMWUCyftnMB+ar2Dv5pEYc7sQr93gJyE7pnU=; b=AYxAEo77/S8zD5p0BrRSsORCa2GAq94wkMxJHtaznvLxOjaqhbM5lzbTcnex72Pj9D 3jGTMUh9zNEI3xg5LdWeTS08a2TGvU5zE7TiVgk0skp/edPDpdzJtNiD2UdqQMzu6R7o ghpr4itIvF5Eh3bF9bJf2hr5db80i9djt9GaDF1/tgF9Q2t1fyIwxDvsh02iRvoQSx3K ZrzFzmt94azLoqRdi+OLaIFhs2hHamNkxaW3q69icciXygdmxFiS6QDTUQDHoCqlk/uz fn2gm1R2SGhVyJWfVmsoWL0L6kr/mzf79ARbHqNLG+797+g3BIdfyKwjqJ+MnuzMHA4/ kS3Q== X-Gm-Message-State: AKwxytdxUlh1m4aTCIANzpic5G4MEigB8CLdSKeLgsDnNJmxPJYv3cdC O8ffCOJ4QP7NKpqCLFPSykABBg== X-Google-Smtp-Source: ACJfBovRHayLVidIriUcbUaZFg1kgkGW2p2aiaGOVtwjSt73xEh0sTRelVIgCU+dVZpbKhL7rTSISw== X-Received: by 10.46.124.18 with SMTP id x18mr6240393ljc.74.1516278719004; Thu, 18 Jan 2018 04:31:59 -0800 (PST) Received: from gilgamesh.semihalf.com (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id s23sm1303906ljs.1.2018.01.18.04.31.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Jan 2018 04:31:58 -0800 (PST) From: Marcin Wojtas To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, linux-acpi@vger.kernel.org Cc: graeme.gregory@linaro.org, davem@davemloft.net, linux@armlinux.org.uk, rafael.j.wysocki@intel.com, andrew@lunn.ch, f.fainelli@gmail.com, antoine.tenart@free-electrons.com, thomas.petazzoni@free-electrons.com, gregory.clement@free-electrons.com, stefanc@marvell.com, nadavh@marvell.com, neta@marvell.com, ard.biesheuvel@linaro.org, mw@semihalf.com, jaz@semihalf.com, tn@semihalf.com Subject: [net-next: PATCH v4 1/7] device property: Introduce fwnode_get_mac_address() Date: Thu, 18 Jan 2018 13:31:38 +0100 Message-Id: <1516278704-17141-2-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516278704-17141-1-git-send-email-mw@semihalf.com> References: <1516278704-17141-1-git-send-email-mw@semihalf.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Until now there were two almost identical functions for obtaining MAC address - of_get_mac_address() and, more generic, device_get_mac_address(). However it is not uncommon, that the network interface is represented as a child of the actual controller, hence it is not associated directly to any struct device, required by the latter routine. This commit allows for getting the MAC address for children nodes in the ACPI world by introducing a new function - fwnode_get_mac_address(). This commit also changes device_get_mac_address() routine to be its wrapper, in order to prevent unnecessary duplication. Signed-off-by: Marcin Wojtas Acked-by: Rafael J. Wysocki --- drivers/base/property.c | 28 ++++++++++++++------ include/linux/property.h | 2 ++ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/drivers/base/property.c b/drivers/base/property.c index 851b1b6..f261d1a 100644 --- a/drivers/base/property.c +++ b/drivers/base/property.c @@ -1153,11 +1153,11 @@ int device_get_phy_mode(struct device *dev) } EXPORT_SYMBOL_GPL(device_get_phy_mode); -static void *device_get_mac_addr(struct device *dev, +static void *fwnode_get_mac_addr(struct fwnode_handle *fwnode, const char *name, char *addr, int alen) { - int ret = device_property_read_u8_array(dev, name, addr, alen); + int ret = fwnode_property_read_u8_array(fwnode, name, addr, alen); if (ret == 0 && alen == ETH_ALEN && is_valid_ether_addr(addr)) return addr; @@ -1165,8 +1165,8 @@ static void *device_get_mac_addr(struct device *dev, } /** - * device_get_mac_address - Get the MAC for a given device - * @dev: Pointer to the device + * fwnode_get_mac_address - Get the MAC from the firmware node + * @fwnode: Pointer to the firmware node * @addr: Address of buffer to store the MAC in * @alen: Length of the buffer pointed to by addr, should be ETH_ALEN * @@ -1187,19 +1187,31 @@ static void *device_get_mac_addr(struct device *dev, * In this case, the real MAC is in 'local-mac-address', and 'mac-address' * exists but is all zeros. */ -void *device_get_mac_address(struct device *dev, char *addr, int alen) +void *fwnode_get_mac_address(struct fwnode_handle *fwnode, char *addr, int alen) { char *res; - res = device_get_mac_addr(dev, "mac-address", addr, alen); + res = fwnode_get_mac_addr(fwnode, "mac-address", addr, alen); if (res) return res; - res = device_get_mac_addr(dev, "local-mac-address", addr, alen); + res = fwnode_get_mac_addr(fwnode, "local-mac-address", addr, alen); if (res) return res; - return device_get_mac_addr(dev, "address", addr, alen); + return fwnode_get_mac_addr(fwnode, "address", addr, alen); +} +EXPORT_SYMBOL(fwnode_get_mac_address); + +/** + * device_get_mac_address - Get the MAC for a given device + * @dev: Pointer to the device + * @addr: Address of buffer to store the MAC in + * @alen: Length of the buffer pointed to by addr, should be ETH_ALEN + */ +void *device_get_mac_address(struct device *dev, char *addr, int alen) +{ + return fwnode_get_mac_address(dev_fwnode(dev), addr, alen); } EXPORT_SYMBOL(device_get_mac_address); diff --git a/include/linux/property.h b/include/linux/property.h index f6189a3..35620e0 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -279,6 +279,8 @@ int device_get_phy_mode(struct device *dev); void *device_get_mac_address(struct device *dev, char *addr, int alen); +void *fwnode_get_mac_address(struct fwnode_handle *fwnode, + char *addr, int alen); struct fwnode_handle *fwnode_graph_get_next_endpoint( const struct fwnode_handle *fwnode, struct fwnode_handle *prev); struct fwnode_handle *