From patchwork Sat May 9 21:56:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Reynes X-Patchwork-Id: 470394 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 953E9140134 for ; Sun, 10 May 2015 07:57:21 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=pU4WWkm8; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751900AbbEIV4s (ORCPT ); Sat, 9 May 2015 17:56:48 -0400 Received: from mail-wi0-f170.google.com ([209.85.212.170]:38123 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751510AbbEIV4q (ORCPT ); Sat, 9 May 2015 17:56:46 -0400 Received: by wiun10 with SMTP id n10so60456866wiu.1; Sat, 09 May 2015 14:56:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=ygwWMG6QQvzauJK+F7jtk92CKbg50Zh9Fpt/lNLVd0I=; b=pU4WWkm8Gls4ylIQY5D5WENGr7LzUeD3qKSr+Ar2nhgltFecgREFbQyj0o2ZFkM5cg ypgx5fPeoUJs4bZV+ixeg0r8dRRIS8Zt7wNTtrrGujr91xY8FkdG3lzLF9OyHeK/5HDA 56T3RldnCofcTZAg+kl9Rw/fnREbbLCB+QqVxmhRF5oC87PJVK+GSKINfPjAJ/5G3fDB jC/YYljS7mBJ4L4yzvFIlxVjH33SiuY1I2aMTaFx2xk2Aeh1Pm7VoyW6TzAS0E3DOgCK But5Mxzt6QwSuSjyaCmBwz7UlwWQ5zNUrHdeivOBuTGczwCvQXtFLL1zEF1uWbE7smIT CBhw== X-Received: by 10.194.250.98 with SMTP id zb2mr7768548wjc.90.1431208605153; Sat, 09 May 2015 14:56:45 -0700 (PDT) Received: from localhost.localdomain (bny93-7-88-161-33-221.fbx.proxad.net. [88.161.33.221]) by mx.google.com with ESMTPSA id dz4sm5606298wib.17.2015.05.09.14.56.43 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 09 May 2015 14:56:44 -0700 (PDT) From: Philippe Reynes To: davem@davemloft.net, B38611@freescale.com, rmk+kernel@arm.linux.org.uk, Frank.Li@freescale.com, LW@KARO-electronics.de Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Philippe Reynes Subject: [PATCH v2] net: fec: add support of ethtool get_regs Date: Sat, 9 May 2015 23:56:35 +0200 Message-Id: <1431208595-7301-1-git-send-email-tremyfr@gmail.com> X-Mailer: git-send-email 1.7.4.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This enables the ethtool's "-d" and "--register-dump" options for fec devices. Signed-off-by: Philippe Reynes --- drivers/net/ethernet/freescale/fec_main.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) Changelog: v2: (thanks Russell King and David Miler for the feedback) - don't use memcpy_fromio to copy registers diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 66d47e4..5875913 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -2118,6 +2118,32 @@ static void fec_enet_get_drvinfo(struct net_device *ndev, strlcpy(info->bus_info, dev_name(&ndev->dev), sizeof(info->bus_info)); } +static int fec_enet_get_regs_len(struct net_device *ndev) +{ + struct fec_enet_private *fep = netdev_priv(ndev); + struct resource *r; + int s = 0; + + r = platform_get_resource(fep->pdev, IORESOURCE_MEM, 0); + if (r) { + s = resource_size(r); + } + + return s; +} + +static void fec_enet_get_regs(struct net_device *ndev, + struct ethtool_regs *regs, void *regbuf) +{ + struct fec_enet_private *fep = netdev_priv(ndev); + u32 __iomem *theregs = (u32 __iomem *) fep->hwp; + u32 *buf = (u32 *)regbuf; + int i; + + for (i = 0; i < regs->len / sizeof(u32); i++) + buf[i] = readl(&theregs[i]); +} + static int fec_enet_get_ts_info(struct net_device *ndev, struct ethtool_ts_info *info) { @@ -2515,6 +2541,8 @@ static const struct ethtool_ops fec_enet_ethtool_ops = { .get_settings = fec_enet_get_settings, .set_settings = fec_enet_set_settings, .get_drvinfo = fec_enet_get_drvinfo, + .get_regs_len = fec_enet_get_regs_len, + .get_regs = fec_enet_get_regs, .nway_reset = fec_enet_nway_reset, .get_link = ethtool_op_get_link, .get_coalesce = fec_enet_get_coalesce,