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: 10170155 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 58A98603B5 for ; Wed, 17 Jan 2018 16:57:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 47E8A28533 for ; Wed, 17 Jan 2018 16:57:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3C77628584; Wed, 17 Jan 2018 16:57:10 +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 AD39828533 for ; Wed, 17 Jan 2018 16:57:09 +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=IqWeC5j31H8IhiPAsHvCrxyWwx 2kdb3Up2NRDYCwzqllYmWB8hEg9D1TGF5qDTPuYhUJ5IXcxaBmHII3Ru/IcwHBXO3xoZckpDdEsa/ dXG1I/o5UERk0hzlgHELU2SGYEz+b8QYdyndGv/zHr7XXn4vovysm82DbZSQcef1z4phrdOIEUrEM YhRFfr3dkY+R8DOmjUZyl2Alax24iLk/WiY/FKc3/OEZ2NjkjlTn/Mb+VdVGCXPpPJV2VUOyGfvdY tlGF8nVbphDckfFeObvgxYHCDPq2NYlJW0xnLG9MgBjjDoSdCYSdpqA6ECRbU8CL8hDw98gExsauT XdPX+yzA==; 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 1ebr1O-0006Xy-UY; Wed, 17 Jan 2018 16:57:06 +0000 Received: from mail-lf0-x243.google.com ([2a00:1450:4010:c07::243]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1ebr0V-0005gf-U0 for linux-arm-kernel@lists.infradead.org; Wed, 17 Jan 2018 16:56:15 +0000 Received: by mail-lf0-x243.google.com with SMTP id f136so1387234lff.8 for ; Wed, 17 Jan 2018 08:56:01 -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=IAU0Tff/cpK3Q76Qguq/YFbtxavEqc4RQStyDjTGVXACKqaoNmQ939Ya/JjiMNFBED ZB5OcdUj7y7wMRux9f02txC5X4Py9x7VmpIPOxWK6dfadergkul8lRhd0R14QfASE3/T kDoFdzeB2q42ilq2bQiSjvrAtOiyuTNK+cBXlzut6xFdpJlCEM8mxYP2HjkYABkw5dUm 26gnYiymhYFe0vSOYOzm5B9Jx3tHFn+rbTLStusJ/hPdx7fSL3H4cvwWpxji1ZtkfsyO xBHZQQ9h5FsHfLNinPUpTCIjjERx3KEO3N0XGGI+3btL8Y+tR/7ecDX6cxZsqg8Ew4Gs hnqg== X-Gm-Message-State: AKwxytcCwJ46u+4XgfYqlHik0+PcGyqM/lhFsCG5629LsbTefi31FMpk cawsdIy46e6ENfwtdqfH/X0owA== 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 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> 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 *