From patchwork Fri Nov 22 14:57:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Jensen X-Patchwork-Id: 3222721 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E2A7FC045B for ; Fri, 22 Nov 2013 14:58:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5767020792 for ; Fri, 22 Nov 2013 14:58:49 +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 E533F205BB for ; Fri, 22 Nov 2013 14:58:47 +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 1VjsBY-0001JB-Pd; Fri, 22 Nov 2013 14:58:21 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VjsBS-0000Kp-R3; Fri, 22 Nov 2013 14:58:14 +0000 Received: from mail-la0-x22e.google.com ([2a00:1450:4010:c03::22e]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VjsBF-0000HP-M5 for linux-arm-kernel@lists.infradead.org; Fri, 22 Nov 2013 14:58:04 +0000 Received: by mail-la0-f46.google.com with SMTP id eh20so1017993lab.19 for ; Fri, 22 Nov 2013 06:57:39 -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=xWWyUWqM+FV7rWxpkJf7K2baLcoze6goFpNqLBlqMd4=; b=bneCSkpbb9qFptm+tM5CkYxTeLlqqkIXuiejlg/V9HGQEFA5ppbBlXafC1q9iXMtbC MJOiFfb8M6zGCUOkYFrFlbsYa/ZydRqD2hq4JSaf/HOTdLsquec8Zc4H4Pyk6imzLy/n iwdnhfmzRAwrCVksHYKUdsi4emIqG/6BohqOVDHM1Z1LKKsbN6ryl7P0acOla2ErsK01 fcxEnlQa3ItGHKNH7TCUvpIr2Hny+w6OG4UXpsUJA3CbsigrfjncWSrQW/DbK6+SKu8L 0JwjvgppAzzzgGdoGfEvGSvjyrIPfoysF+kfMsG8X0A6nWLmRC9IloQXvaROIYB00n8O JGKg== X-Received: by 10.152.9.9 with SMTP id v9mr1512864laa.41.1385132259505; Fri, 22 Nov 2013 06:57:39 -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 e10sm38129328laa.6.2013.11.22.06.57.37 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 22 Nov 2013 06:57:38 -0800 (PST) From: Jonas Jensen To: netdev@vger.kernel.org Subject: [PATCH 2/5] net: MOXA ART: connect to PHY and add ethtool support Date: Fri, 22 Nov 2013 15:57:19 +0100 Message-Id: <1385132242-3204-2-git-send-email-jonas.jensen@gmail.com> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1385132242-3204-1-git-send-email-jonas.jensen@gmail.com> References: <1385132242-3204-1-git-send-email-jonas.jensen@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131122_095802_091300_D202E995 X-CRM114-Status: GOOD ( 18.88 ) X-Spam-Score: -2.0 (--) Cc: Jonas Jensen , davem@davemloft.net, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.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.6 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 The kernel now has a MDIO bus driver and a phy_driver (RTL8201CP), connect to this PHY using OF and add ethtool support. Signed-off-by: Jonas Jensen --- Notes: Applies to next-20131122 drivers/net/ethernet/moxa/moxart_ether.c | 179 ++++++++++++++++++++++++++++++- drivers/net/ethernet/moxa/moxart_ether.h | 1 + 2 files changed, 179 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/moxa/moxart_ether.c b/drivers/net/ethernet/moxa/moxart_ether.c index 3c14afd..bcc6005 100644 --- a/drivers/net/ethernet/moxa/moxart_ether.c +++ b/drivers/net/ethernet/moxa/moxart_ether.c @@ -26,9 +26,15 @@ #include #include #include +#include +#include #include "moxart_ether.h" +#define DRV_NAME "moxart-ethernet" +#define DRV_VERSION "0.2" +#define MOXART_NUM_STATS 16 + static inline void moxart_emac_write(struct net_device *ndev, unsigned int reg, unsigned long value) { @@ -61,6 +67,145 @@ 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)); + info->n_stats = MOXART_NUM_STATS; +} + +static int moxart_get_settings(struct net_device *ndev, struct ethtool_cmd *cmd) +{ + struct moxart_mac_priv_t *priv = netdev_priv(ndev); + + if (!priv->phy_dev) + return -ENODEV; + + 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); + + if (!priv->phy_dev) + return -ENODEV; + + 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); + + if (!priv->phy_dev) + return -EINVAL; + + 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); + + if (!netif_running(ndev)) + return -EINVAL; + + if (!priv->phy_dev) + return -ENODEV; + + return phy_mii_ioctl(priv->phy_dev, ir, cmd); +} + static void moxart_mac_free_memory(struct net_device *ndev) { struct moxart_mac_priv_t *priv = netdev_priv(ndev); @@ -169,6 +314,10 @@ static int moxart_mac_open(struct net_device *ndev) moxart_update_mac_address(ndev); moxart_mac_setup_desc_ring(ndev); moxart_mac_enable(ndev); + + if (priv->phy_dev) + phy_start(priv->phy_dev); + netif_start_queue(ndev); netdev_dbg(ndev, "%s: IMR=0x%x, MACCR=0x%x\n", @@ -184,6 +333,9 @@ static int moxart_mac_stop(struct net_device *ndev) napi_disable(&priv->napi); + if (priv->phy_dev) + phy_stop(priv->phy_dev); + netif_stop_queue(ndev); /* disable all interrupts */ @@ -429,12 +581,22 @@ static struct net_device_ops moxart_netdev_ops = { .ndo_set_mac_address = moxart_set_mac_address, .ndo_validate_addr = eth_validate_addr, .ndo_change_mtu = eth_change_mtu, + .ndo_do_ioctl = moxart_do_ioctl, }; +static void moxart_adjust_link(struct net_device *ndev) +{ +#ifdef DEBUG + struct moxart_mac_priv_t *priv = netdev_priv(ndev); + + phy_print_status(priv->phy_dev); +#endif +} + static int moxart_mac_probe(struct platform_device *pdev) { struct device *p_dev = &pdev->dev; - struct device_node *node = p_dev->of_node; + struct device_node *node = p_dev->of_node, *phy_node; struct net_device *ndev; struct moxart_mac_priv_t *priv; struct resource *res; @@ -455,6 +617,20 @@ static int moxart_mac_probe(struct platform_device *pdev) priv = netdev_priv(ndev); priv->ndev = ndev; + phy_node = of_parse_phandle(node, "phy-handle", 0); + if (!phy_node) + dev_err(p_dev, "of_parse_phandle failed\n"); + + if (phy_node) { + priv->phy_dev = of_phy_connect(priv->ndev, phy_node, + &moxart_adjust_link, + 0, PHY_INTERFACE_MODE_MII); + if (!priv->phy_dev) { + dev_err(p_dev, "of_phy_connect failed\n"); + ret = -ENODEV; + } + } + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ndev->base_addr = res->start; priv->base = devm_ioremap_resource(p_dev, res); @@ -516,6 +692,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) { diff --git a/drivers/net/ethernet/moxa/moxart_ether.h b/drivers/net/ethernet/moxa/moxart_ether.h index 2be9280..193618e 100644 --- a/drivers/net/ethernet/moxa/moxart_ether.h +++ b/drivers/net/ethernet/moxa/moxart_ether.h @@ -297,6 +297,7 @@ struct moxart_mac_priv_t { unsigned int reg_imr; struct napi_struct napi; struct net_device *ndev; + struct phy_device *phy_dev; dma_addr_t rx_base; dma_addr_t rx_mapping[RX_DESC_NUM];