From patchwork Fri Jul 19 13:55:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 260268 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 5A5DA2C008E for ; Fri, 19 Jul 2013 23:56:14 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760028Ab3GSN4H (ORCPT ); Fri, 19 Jul 2013 09:56:07 -0400 Received: from mail-ea0-f179.google.com ([209.85.215.179]:41763 "EHLO mail-ea0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759542Ab3GSN4G (ORCPT ); Fri, 19 Jul 2013 09:56:06 -0400 Received: by mail-ea0-f179.google.com with SMTP id b15so2445657eae.10 for ; Fri, 19 Jul 2013 06:56:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=D1kkHfDxepXhcEG4PZguFgK8Z9CmE5IXibeJtAtyQu0=; b=VdwzLwNIUlurc+nMwULOAcZ8PKml4stX63QGv0NTKvQYx3jRoqlJj7Rs52Sr6ENEpS rcv7T585aOEJD6aoU84psZ9BiYMXpY+y2InSWhdbExwngqYlBTsxT7hLaXQkim9ouS8Y 7m6OUCpLkYQs3QXJaaUkAlqlo/ySKaPenvC/+MPU2/EJWxeMNlfOC2A1Ai1FTh/GHrUn 10SthhWadLTWCR04D1wDGhLnXlxeYhc1Jpph9DTBHEtNwvG2p/ejEl4VWkahjDAxHVnw lP7H1eUxY85y5JUCQO4NcMoR8qTeYLBvnnqW54YDzhwkumn4+6cJBXnkigHkn+9SiBea tSvA== X-Received: by 10.15.64.68 with SMTP id n44mr16166718eex.73.1374242164342; Fri, 19 Jul 2013 06:56:04 -0700 (PDT) Received: from localhost (ip-89-176-153-53.net.upcbroadband.cz. [89.176.153.53]) by mx.google.com with ESMTPSA id bj46sm27578569eeb.13.2013.07.19.06.56.02 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 19 Jul 2013 06:56:03 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, stephen@networkplumber.org, Narendra_K@Dell.com, bhutchings@solarflare.com, john.r.fastabend@intel.com Subject: [patch net-next 3/3] net: export physical port id via sysfs Date: Fri, 19 Jul 2013 15:55:51 +0200 Message-Id: <1374242152-10325-4-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1374242152-10325-1-git-send-email-jiri@resnulli.us> References: <1374242152-10325-1-git-send-email-jiri@resnulli.us> X-Gm-Message-State: ALoCoQn8bHndKeRoUxyAuJ80kRIcATkGBilLGezCzSIQtMuWMG/i13Zl7R9ZZWoQoGHncY+s/pMI Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Jiri Pirko --- net/core/net-sysfs.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index 981fed3..fb19ede 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -334,6 +334,46 @@ static ssize_t store_group(struct device *dev, struct device_attribute *attr, return netdev_store(dev, attr, buf, len, change_group); } +static size_t _format_port_id(char *buf, int buflen, + const unsigned char *id, int len) +{ + int i; + char *cp = buf; + + for (i = 0; i < len; i++) + cp += scnprintf(cp, buflen - (cp - buf), "%02x", id[i]); + return cp - buf; +} + +ssize_t sysfs_format_port_id(char *buf, const unsigned char *id, int len) +{ + size_t l; + + l = _format_port_id(buf, PAGE_SIZE, id, len); + l += scnprintf(buf + l, PAGE_SIZE - l, "\n"); + return (ssize_t)l; +} +static ssize_t show_phys_port_id(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct net_device *netdev = to_net_dev(dev); + ssize_t ret = 0; + + if (!rtnl_trylock()) + return restart_syscall(); + + if (dev_isalive(netdev) && netdev->netdev_ops->ndo_get_phys_port_id) { + struct netdev_phys_port_id ppid; + + ret = netdev->netdev_ops->ndo_get_phys_port_id(netdev, &ppid); + if (!ret) + ret = sysfs_format_port_id(buf, ppid.id, ppid.id_len); + } + rtnl_unlock(); + + return ret; +} + static struct device_attribute net_class_attributes[] = { __ATTR(addr_assign_type, S_IRUGO, show_addr_assign_type, NULL), __ATTR(addr_len, S_IRUGO, show_addr_len, NULL), @@ -355,6 +395,7 @@ static struct device_attribute net_class_attributes[] = { __ATTR(tx_queue_len, S_IRUGO | S_IWUSR, show_tx_queue_len, store_tx_queue_len), __ATTR(netdev_group, S_IRUGO | S_IWUSR, show_group, store_group), + __ATTR(phys_port_id, S_IRUGO, show_phys_port_id, NULL), {} };