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: 10173081 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 E61D6603B5 for ; Thu, 18 Jan 2018 12:33:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC3DD1FF3E for ; Thu, 18 Jan 2018 12:33:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D069A27C0B; Thu, 18 Jan 2018 12:33:03 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 551801FF3E for ; Thu, 18 Jan 2018 12:33:03 +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=uZL7rLgbQpZAkBnVM03Vfm5f+wlJ0cK3wcAstWt1yK8=; b=nBK6FOX3TtCRyZ7LvxjWN1Of3s WmpFirmFLRS+WpFcXoMp5Xyo3o+LpmCvceuLKsqeHaN0fqIfO21gZqEO/j8P153y69n+HXANlgd32 3bC0T6mXQtugKB+cA12ul4oVTZ6mvHh83Zw2HI6gJVR+ugvfjnUig0m8y/SmK1zyPolR4Rmfe6Fa8 LtWasgXI+pJR1QfEvfCvIrTXRnxq+++6CJ4IXcJOFy2+jEwmkupz279cOq6wwyvkpNHdiJE3OHwca 9iUIfs63edeN3+uLLzhVT42kvY6CBfOcwq9+ne9i7oIVRtnMCXK47JgFHAomRgGgYFMhrOQcx6CZA GGaO5sPg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1ec9NL-0001el-OU; Thu, 18 Jan 2018 12:32:59 +0000 Received: from mail-lf0-x242.google.com ([2a00:1450:4010:c07::242]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1ec9MY-0000eI-Bj for linux-arm-kernel@lists.infradead.org; Thu, 18 Jan 2018 12:32:20 +0000 Received: by mail-lf0-x242.google.com with SMTP id k19so6191021lfj.1 for ; Thu, 18 Jan 2018 04:32:00 -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=AGznpH9e6Xe+HgQJ12H6byhjCU5FnIn8eKUnnGvmkHH7HXNPF68AzGnPARnmnVNFQu SG6MBdxOqDlsRLzki2tQ8cmUx3UFu26es/1PB7In4RfV3ybSxHMThYIh79GV4jdsm3Dp u+/PpV7jk1avYyCU5n6Eu5nPUcjbjVdRv4pG+dMyNvV9Yi89/MlA7k61MzD/QF4AEuri FJJeU7eN/vO0HI7xaIvPIcD+x0rzZP2P3Me17JrO6h8jbmF46bO9GtI/RbU3K2jBmRnD sTziuNiDlO75wT8fLXQx2rWGu4b7+Xd5LxgLjUJMSK1+lTDR+8w1Npj+ggKmvIYk1sNI 7pvg== X-Gm-Message-State: AKwxytddLlP/kv6vdaxQlHwd4VF2cit1R+xEpD+yBuPo+7Ndm6yjLIff k4LvEUAyyES9XXSB0gFrv5+abQ== 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 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> 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: thomas.petazzoni@free-electrons.com, andrew@lunn.ch, f.fainelli@gmail.com, graeme.gregory@linaro.org, ard.biesheuvel@linaro.org, jaz@semihalf.com, antoine.tenart@free-electrons.com, rafael.j.wysocki@intel.com, linux@armlinux.org.uk, nadavh@marvell.com, neta@marvell.com, tn@semihalf.com, gregory.clement@free-electrons.com, stefanc@marvell.com, mw@semihalf.com, davem@davemloft.net 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 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 *