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: 849920 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="gQ+/uSvb"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3z0bCk2zfCz9rxm for ; Mon, 18 Dec 2017 20:22:26 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933382AbdLRJWW (ORCPT ); Mon, 18 Dec 2017 04:22:22 -0500 Received: from mail-lf0-f66.google.com ([209.85.215.66]:46148 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933291AbdLRJSO (ORCPT ); Mon, 18 Dec 2017 04:18:14 -0500 Received: by mail-lf0-f66.google.com with SMTP id r143so16911075lfe.13 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=GBab81Lzmb7BHUYDZVKA8+Idxnfmiv/PrsldeVUtuaW6IRiZlbgKJJHiscnUb6Ox+P JWtp87oCTxR3sSeFsf/ZjqON9Mydi9NH++MWd0LLBFRzM2lInQwJPbFMWVqRfCVe6mGG zKbseI5yZxxG7sUy1L05rkSGvhI/0NrAr+VCEno3HFpKXQVdK86zkqgFn0uT47oleVtT dYH3PoWAw8r52MxoE8ULrY1GLicQy+XnoH1kru8uzjpajkJ2QegGCcuxtlW8Ptvrl1tR AiQXQppLb6KJz67bDJl/GDx8ggVxc8mG+7I4pHSCer0pKdIthW0m2RBvioiPH+vAQQZI Jr2w== X-Gm-Message-State: AKGB3mJ+qpn09MxPdGrOxyKaSNYRJat691IkSYjVJtcS1+gsa5uiYMfm nOBnqmuYTcS2qGVvF9LiJP2oRg== 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 Cc: davem@davemloft.net, linux@arm.linux.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 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> 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 --- 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 *