From patchwork Mon Nov 25 15:27:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Jensen X-Patchwork-Id: 3232981 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 117CA9F3B8 for ; Mon, 25 Nov 2013 15:30:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 499A4200EC for ; Mon, 25 Nov 2013 15:30:39 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DCD032021C for ; Mon, 25 Nov 2013 15:30:36 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vky5s-0006pN-2C; Mon, 25 Nov 2013 15:29:01 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vky5T-0002Ed-Ul; Mon, 25 Nov 2013 15:28:35 +0000 Received: from mail-la0-f44.google.com ([209.85.215.44]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vky4r-00028Z-UK for linux-arm-kernel@lists.infradead.org; Mon, 25 Nov 2013 15:28:00 +0000 Received: by mail-la0-f44.google.com with SMTP id ep20so3188253lab.31 for ; Mon, 25 Nov 2013 07:27:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MCS96xd/SIULWWutBE8BisboS2oJkcGqlBl25MsnP1I=; b=KFheT1EqRRKXqfBdy6RO5mAevp2o6t+8AP6LkXVFnF9mTr62rwVeQz20K3ygtQftnB YTXwGbC5i4CLafKDN7FrMDqOpUm9NS++fl49yjL7+ygGZOxI/oI6BAMSaSJ0KCk9h3+V BLg+MzRXfheVxNq2NQPAmmMi3vZ7lDDrItXFmwM4Twgc2RpadVHIMQ9UZN1O+FKJMKQ6 hCHoZk1fsKvSp58vdKdSc1vd2b33AjLXskXQYzU5qT++0U/SC7ouNU1YoyQwZ2xEc5Tx 2EBWWL7qhVA5xJOQxvmd0uNlm94ihDvclsxrG5s5U2RbC25GtHRx3CwUYXiYG0aLEyJ1 r4PQ== X-Received: by 10.112.145.105 with SMTP id st9mr1350294lbb.46.1385393250295; Mon, 25 Nov 2013 07:27:30 -0800 (PST) Received: from Ildjarn.ath.cx (static-213-115-41-10.sme.bredbandsbolaget.se. [213.115.41.10]) by mx.google.com with ESMTPSA id bo10sm6487292lbb.16.2013.11.25.07.27.28 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 25 Nov 2013 07:27:29 -0800 (PST) From: Jonas Jensen To: netdev@vger.kernel.org Subject: [PATCH v2 3/6] net: MOXA ART: add ethtool support Date: Mon, 25 Nov 2013 16:27:05 +0100 Message-Id: <1385393228-22416-3-git-send-email-jonas.jensen@gmail.com> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1385393228-22416-1-git-send-email-jonas.jensen@gmail.com> References: <1385393228-22416-1-git-send-email-jonas.jensen@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131125_102758_277674_F148AAC5 X-CRM114-Status: GOOD ( 13.83 ) X-Spam-Score: -2.7 (--) Cc: f.fainelli@gmail.com, linux-kernel@vger.kernel.org, Jonas Jensen , bhutchings@solarflare.com, davem@davemloft.net, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add and assign ethtool_ops callback functions. Signed-off-by: Jonas Jensen Reviewed-by: Ben Hutchings --- Notes: Thanks for reviewing! Changes since v1: 1. declare MOXART_NUM_STATS with ARRAY_SIZE macro 2. don't initialise info->n_stats in moxart_get_drvinfo() 3. remove "if (!priv->phy_dev) return -ENODEV;" moxart_get_settings(), moxart_set_settings(), moxart_nway_reset() Applies to next-20131125 drivers/net/ethernet/moxa/moxart_ether.c | 121 +++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/drivers/net/ethernet/moxa/moxart_ether.c b/drivers/net/ethernet/moxa/moxart_ether.c index 1b87034..cd46a23 100644 --- a/drivers/net/ethernet/moxa/moxart_ether.c +++ b/drivers/net/ethernet/moxa/moxart_ether.c @@ -32,6 +32,10 @@ #include "moxart_ether.h" +#define DRV_NAME "moxart-ethernet" +#define DRV_VERSION "0.2" +#define MOXART_NUM_STATS ARRAY_SIZE(ethtool_stats_keys) + static inline void moxart_emac_write(struct net_device *ndev, unsigned int reg, unsigned long value) { @@ -64,6 +68,122 @@ static int moxart_set_mac_address(struct net_device *ndev, void *addr) return 0; } +static struct { + const char str[ETH_GSTRING_LEN]; +} ethtool_stats_keys[] = { + { "tx_ok_mcol_2to15" }, + { "tx_ok_1col" }, + { "rx_frame_pause" }, + { "frame_align_err" }, + { "err_col_late_16" }, + { "err_col_16" }, + { "rx_runt" }, + { "late_col" }, + { "crc_err" }, + { "rx_ftl" }, + { "rx_fifo_full" }, + { "rx_col" }, + { "rx_bcast" }, + { "rx_mcast" }, + { "rx_ok" }, + { "tx_ok" }, +}; + +static void moxart_get_drvinfo(struct net_device *ndev, + struct ethtool_drvinfo *info) +{ + strlcpy(info->driver, DRV_NAME, sizeof(info->driver)); + strlcpy(info->version, DRV_VERSION, sizeof(info->version)); + strlcpy(info->bus_info, dev_name(&ndev->dev), sizeof(info->bus_info)); +} + +static int moxart_get_settings(struct net_device *ndev, struct ethtool_cmd *cmd) +{ + struct moxart_mac_priv_t *priv = netdev_priv(ndev); + + return phy_ethtool_gset(priv->phy_dev, cmd); +} + +static int moxart_set_settings(struct net_device *ndev, struct ethtool_cmd *cmd) +{ + struct moxart_mac_priv_t *priv = netdev_priv(ndev); + + return phy_ethtool_sset(priv->phy_dev, cmd); +} + +static int moxart_nway_reset(struct net_device *ndev) +{ + struct moxart_mac_priv_t *priv = netdev_priv(ndev); + + return genphy_restart_aneg(priv->phy_dev); +} + +static void moxart_get_ethtool_stats(struct net_device *ndev, + struct ethtool_stats *estats, + u64 *tmp_stats) +{ + struct moxart_mac_priv_t *priv = netdev_priv(ndev); + u32 s; + int i = 0; + + s = readl(priv->base + REG_TX_COL_COUNTER); + tmp_stats[i++] = s & 0xffff0000; + tmp_stats[i++] = s & 0x0000ffff; + s = readl(priv->base + REG_RPF_AEP_COUNTER); + tmp_stats[i++] = s & 0xffff0000; + tmp_stats[i++] = s & 0x0000ffff; + s = readl(priv->base + REG_XM_PG_COUNTER); + tmp_stats[i++] = s & 0xffff0000; + tmp_stats[i++] = s & 0x0000ffff; + s = readl(priv->base + REG_RUNT_TLC_COUNTER); + tmp_stats[i++] = s & 0xffff0000; + tmp_stats[i++] = s & 0x0000ffff; + s = readl(priv->base + REG_CRC_FTL_COUNTER); + tmp_stats[i++] = s & 0xffff0000; + tmp_stats[i++] = s & 0x0000ffff; + s = readl(priv->base + REG_RLC_RCC_COUNTER); + tmp_stats[i++] = s & 0xffff0000; + tmp_stats[i++] = s & 0x0000ffff; + tmp_stats[i++] = readl(priv->base + REG_BROC_COUNTER); + tmp_stats[i++] = readl(priv->base + REG_MULCA_COUNTER); + tmp_stats[i++] = readl(priv->base + REG_XP_COUNTER); + tmp_stats[i++] = readl(priv->base + REG_RP_COUNTER); +} + +static int moxart_get_sset_count(struct net_device *netdev, + int string_set) +{ + switch (string_set) { + case ETH_SS_STATS: + return MOXART_NUM_STATS; + default: + return -EINVAL; + } +} + +static void moxart_get_strings(struct net_device *dev, u32 stringset, u8 *data) +{ + switch (stringset) { + case ETH_SS_STATS: + memcpy(data, ðtool_stats_keys, sizeof(ethtool_stats_keys)); + break; + default: + WARN_ON(1); + break; + } +} + +static const struct ethtool_ops moxart_ethtool_ops = { + .set_settings = moxart_set_settings, + .get_settings = moxart_get_settings, + .get_drvinfo = moxart_get_drvinfo, + .nway_reset = moxart_nway_reset, + .get_link = ethtool_op_get_link, + .get_ethtool_stats = moxart_get_ethtool_stats, + .get_sset_count = moxart_get_sset_count, + .get_strings = moxart_get_strings, +}; + static int moxart_do_ioctl(struct net_device *ndev, struct ifreq *ir, int cmd) { struct moxart_mac_priv_t *priv = netdev_priv(ndev); @@ -606,6 +726,7 @@ static int moxart_mac_probe(struct platform_device *pdev) ndev->irq = irq; SET_NETDEV_DEV(ndev, &pdev->dev); + SET_ETHTOOL_OPS(ndev, &moxart_ethtool_ops); ret = register_netdev(ndev); if (ret) {