From patchwork Sun Dec 31 11:58:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Wojtas X-Patchwork-Id: 854211 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="cTgMmBI8"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3z8f4W2fSBz9s84 for ; Sun, 31 Dec 2017 22:59:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751208AbdLaL64 (ORCPT ); Sun, 31 Dec 2017 06:58:56 -0500 Received: from mail-lf0-f66.google.com ([209.85.215.66]:38173 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751027AbdLaL6y (ORCPT ); Sun, 31 Dec 2017 06:58:54 -0500 Received: by mail-lf0-f66.google.com with SMTP id w196so33886502lff.5 for ; Sun, 31 Dec 2017 03:58:53 -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=cTgMmBI8LZ4EMA75usO5nCl5aesSBfmhlyT0MBObXZJEgfSLCuDOMsa1PlT6l3kuae F3BYd3ClKAjS6QJVZWnfttj/s/0W0EMC19u2HywKd53+/2sZ5rL8tBsnqEErY01FG3vx vdc8Dx9ZMua5yyOZNRp7/sdRfRVLB7RascL5JOpESD8/RoFIspcaHZim+7+MKn+zL/37 Cq4/2uR+EwJuUeb53jHSra/VB+IB7JztUB5XVN1mzvmq5gaFO/Rr6oCaY0OCG+LrQAUJ DRAF7v/BD1OaePuL4RHuX1akLHU4uFpXJQpUd7AZGSWA31id4iAd3jZIrvXX5MXgfvWW ECqw== 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=YK4qck7QrhToHTpBugl7cdsb1DvLgI/+qM+ulz1ru5nhRir0Drx8msbp3SWKN7yyqj O8OEDEwaC9oT0WOJJIkHqy++73n00L60lSSKcrz4a6Lrz7zO0iV1ASCWzr+Bh/qbFovZ WjWgg9kcAu6VwbiRf5Y6Lxl8YW9qv+xGE/YDvS76H7WkgR49iXP6r+hJCXtvLgwNmhR+ dFa+qHe0JZRXUv5hm1kMhvBEBZvC1WCans90vXmEj4t0fN0Rhyga+q2+P0LCgnH8mOmI qcbF1viPEGMIZrr2PibfWLfM+zJW00hDes6GUPVvjKXJDB7OhKdAcs9JY0xGPxLVoy3F zFdQ== X-Gm-Message-State: AKGB3mLgaogCdYJ6Ns65YkIx3SnljqXzJrqcn77lQ0VEcjygG8ZhlvC5 TS+9RDW0hzFMbY9wFnh3jGTMdg== X-Google-Smtp-Source: ACJfBovaFnnJdKcRha90Fzkpnsslfljj8lTrq20m45DY4Li177M7Vu5ktW9YiDDYMLdpJNWCVYjPSQ== X-Received: by 10.46.42.130 with SMTP id q124mr23625247ljq.59.1514721532413; Sun, 31 Dec 2017 03:58:52 -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 f10sm8646298lff.56.2017.12.31.03.58.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 31 Dec 2017 03:58:51 -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, ezequiel.garcia@free-electrons.com, nadavh@marvell.com, neta@marvell.com, ard.biesheuvel@linaro.org, mw@semihalf.com, jaz@semihalf.com, tn@semihalf.com Subject: [net-next: PATCH v2 1/5] device property: Introduce fwnode_get_mac_address() Date: Sun, 31 Dec 2017 12:58:36 +0100 Message-Id: <1514721520-18964-2-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514721520-18964-1-git-send-email-mw@semihalf.com> References: <1514721520-18964-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 *