From patchwork Mon Dec 18 09:17:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Wojtas X-Patchwork-Id: 10118565 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 D01D260390 for ; Mon, 18 Dec 2017 09:21:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C3FEF28DC5 for ; Mon, 18 Dec 2017 09:21:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B8B4528E0F; Mon, 18 Dec 2017 09:21:33 +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=ham 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 2BFE428DC5 for ; Mon, 18 Dec 2017 09:21:33 +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=O3DMtExlbw7FuAg+BrTfFFPomd89f19ibL7wZwGxmcg=; b=cjC5zWoBSXeReAl2Xd3797jeeF wDXK6N0nVcTqsRIYNnRfXg/l7gwEyop/G2tt09AiuFQOWhIT6lGB6OrLBBbTCgmjP3SuLuicVpMWI g4tuTyNGxZZiXkCpC8DlhRC1nBbN47sLJIeXbpMuexYLb5MrfxSILMMCyz1K7cwpMbAQ7Oxb8axED MwHQgl39zsb0xzt37q/Bh2UOLq8DzCEgm5HXB8aztPW/pndrakCyJ1xKXly6a247I++SzY/snKGTy 6euH0mDYHbcOpIX9uJiIOqdXaGxHX6hKZIm9bLqo2kLsHi+x3DkCvoyDlFb3bCVRzCsSqmm72tP9e h/FBrCag==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eQrc4-0000fA-Bj; Mon, 18 Dec 2017 09:21:32 +0000 Received: from mail-lf0-x243.google.com ([2a00:1450:4010:c07::243]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eQrZD-0005Lc-Ew for linux-arm-kernel@lists.infradead.org; Mon, 18 Dec 2017 09:18:43 +0000 Received: by mail-lf0-x243.google.com with SMTP id f13so16908830lff.12 for ; Mon, 18 Dec 2017 01:18:14 -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=7bX/y12XtUjWPTpHiSGzSv/zRkTHt7m1mJUxszvEoPc=; b=gQ+/uSvbCMXEU5fszAR6771EcyxCuBmwJu462CQZbx4zD9EBwMWxA2aM5M8QsPvJRW vhKfgh+g3MnEDAlSTV55zXpqX0WvK7Yv6pazFuGUAGFzWxwIyBzLBnqD6qqAjCDNiebY p5BNZ6CON2yFB3Odvpq29AhGrkKEWChXDeJ6wejrmc63RE5UuBvEhcbvc5GNwpORA/PK MQTP8lPo5LW538WMC8FqEkN2UIOjCulLSVBqtuyV5iLFdUNlQ8C/XZ9x0kvbb7O8wluC 3aWdNPfrclN1bFBntj61wn4BnOJSZvjK0Bvwps7TGaudWtOTjc277dFScoGr2jdcv6at eT+g== 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=7bX/y12XtUjWPTpHiSGzSv/zRkTHt7m1mJUxszvEoPc=; b=gyD2wAkNvhOfBoWdZqMnmXn99MLwoKDdGzh7ssT+anc4YzEIacTeDrkj4A40qTvX/s SBlZadxZMhW8ASA1td79c+v/gGL4H7DSG36vsU6QyvMqCBPUqmYIA8mT9jx/HzJIPo80 Ij7b5QoewkL0dQC4rhzQDZjcr9Y1Yi0xrfLXmulxj+bE7wQAvJqIdf+zJb+aX7r3JAbt 02WiMGRe/bVKsxOAayQ75QYD9i9pSGM5NMvcs30otuJ0n/y/N5g7n8b7jokNPbqhttqs zYbmsMjw2SaQ+5ohMcvIIMaMZtCDFAhn+/xbbsWSRpk22z6bcPwrUyF4M8EpGu656EVn vfRw== X-Gm-Message-State: AKGB3mKObne/ufrKfUFHQhenoyiKKrCuDGDmmY7ubopbyy/knbWyTd5i c5qPvNN3IAHddeBf7MYWR5w8Zg== X-Google-Smtp-Source: ACJfBou8yo/mQHN4Cvo0iwS18QnoFaM53hphFtnZnrZDepyeURYCbOLnfARNWgKhbuaupzT81jgpzA== X-Received: by 10.25.84.21 with SMTP id i21mr3185729lfb.108.1513588693291; Mon, 18 Dec 2017 01:18:13 -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 r16sm2407186ljd.18.2017.12.18.01.18.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Dec 2017 01:18:12 -0800 (PST) From: Marcin Wojtas To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org Subject: [net-next: PATCH 1/8] device property: Introduce fwnode_get_mac_address() Date: Mon, 18 Dec 2017 10:17:57 +0100 Message-Id: <1513588684-15647-2-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513588684-15647-1-git-send-email-mw@semihalf.com> References: <1513588684-15647-1-git-send-email-mw@semihalf.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171218_011835_906365_0BF3E2F5 X-CRM114-Status: GOOD ( 12.42 ) 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, linux@arm.linux.org.uk, ard.biesheuvel@linaro.org, jaz@semihalf.com, antoine.tenart@free-electrons.com, rafael.j.wysocki@intel.com, nadavh@marvell.com, neta@marvell.com, ezequiel.garcia@free-electrons.com, tn@semihalf.com, gregory.clement@free-electrons.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 --- 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 *