From patchwork Wed Jan 17 16:55:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Wojtas X-Patchwork-Id: 862399 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="Q1GVPuGe"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zMD1d0vLCz9s7v for ; Thu, 18 Jan 2018 04:03:17 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752578AbeAQRDO (ORCPT ); Wed, 17 Jan 2018 12:03:14 -0500 Received: from mail-lf0-f68.google.com ([209.85.215.68]:33524 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753633AbeAQQ4B (ORCPT ); Wed, 17 Jan 2018 11:56:01 -0500 Received: by mail-lf0-f68.google.com with SMTP id t139so8079328lff.0 for ; Wed, 17 Jan 2018 08:56: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=Q1GVPuGeLvZAHN7XHHCClzLQlNVf0RreRSegW97FKShWZNJeGhiqEDrQPO8sWpl1lB u9lGprOY4tebyFNUD2VS7aYddpPKKJkmUb2y4hPuxKEZyjcJLd6tsewn78NdSw3NCLoM 5YnBxyqjlOe1b9/54MKln5xpIPh3lzIESm3DD1BqW8geOg7LD+c5K8desKwrb7J/CqNw 1wTnN1EFnxj+ldl1tt8vs6as01i2r2ZCZNpG6ha8Spcb6/VPnxZH/lRGkIMs2OZ026u3 W1w/Lva2TmRPq9uj7uy1G0XRw32KwGRV3LyqL4/Eof3qhTffWel44BYNp901/dGLUNn3 DuRA== 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=OUDfysi5gWWuFBJPShDsXzlH0bi2yWPwPpkkJAJ3pGmaFnplLHY5NiHp8Sdu0+o84F CSZ1mKVvw25GIewMGpl1RSW2FYEJ5aYwGv6+HpzF+GYW6eRnCUdeM8z1CD5RZiv0WW9e kvXFInDmCzPpetIX2hx6aYdv5G0LtHimQESOl2rd5Q/KhgpOYRiNZyFcyfio/88WS8c7 iVuqYapNvuyOXPfnN90y9lLWUsCXB+FCG8QWGWWGEJA9qKkPwOb20e3NuJ0OZavG8Fda eSqelU5H5Z1mvOGW6WKHi0u8BTp2dysfJL1pIFLpgnOiTMomWuNOJnY3FpC9HUqUeboq w+Jw== X-Gm-Message-State: AKwxytdPZFINTtnZY6nwNA7Ya38XzDr7fE7BowZdCkhNsfE6gmClSowr Q9RHJlzuWWKti0wAgEbj+h6rOw== X-Google-Smtp-Source: ACJfBosTRQ0ak2V1P9KuH/LMhJ3uWbkogpeqD2bDTeldCCpsP8jJWMftDVoZ5n3MNhIeQ2TNN4cwvA== X-Received: by 10.46.5.151 with SMTP id 145mr7180100ljf.134.1516208159552; Wed, 17 Jan 2018 08:55: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 t81sm868347lff.47.2018.01.17.08.55.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 17 Jan 2018 08:55: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 v3 1/7] device property: Introduce fwnode_get_mac_address() Date: Wed, 17 Jan 2018 17:55:40 +0100 Message-Id: <1516208146-4144-2-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516208146-4144-1-git-send-email-mw@semihalf.com> References: <1516208146-4144-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 *