staging: fsl-dpaa2/eth: Add ethtool support
authorIoana Radulescu <ruxandra.radulescu@nxp.com>
Fri, 28 Apr 2017 09:50:30 +0000 (04:50 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 28 Apr 2017 12:25:17 +0000 (14:25 +0200)
Add support for several ethtool operations: show hardware statistics,
get/set link settings, get hash configuration.

Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
Signed-off-by: Bogdan Hamciuc <bogdan.hamciuc@nxp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/fsl-dpaa2/ethernet/Makefile
drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c
drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h
drivers/staging/fsl-dpaa2/ethernet/dpaa2-ethtool.c [new file with mode: 0644]

index 4897d39a1c21d2823a0d20d2d5cef1d6ce624a92..4327ebe803cbab62a4e3b92c066a3b812176a782 100644 (file)
@@ -4,4 +4,4 @@
 
 obj-$(CONFIG_FSL_DPAA2_ETH) += fsl-dpaa2-eth.o
 
-fsl-dpaa2-eth-objs    := dpaa2-eth.o dpni.o
+fsl-dpaa2-eth-objs    := dpaa2-eth.o dpaa2-ethtool.o dpni.o
index abd700e57aebc7b26cb74ab339822478ef33ed05..f13f72f3dd9a7d6701b7f88becd8b09f714bed20 100644 (file)
@@ -46,6 +46,8 @@ MODULE_LICENSE("Dual BSD/GPL");
 MODULE_AUTHOR("Freescale Semiconductor, Inc");
 MODULE_DESCRIPTION("Freescale DPAA2 Ethernet Driver");
 
+const char dpaa2_eth_drv_version[] = "0.1";
+
 static void validate_rx_csum(struct dpaa2_eth_priv *priv,
                             u32 fd_status,
                             struct sk_buff *skb)
@@ -1929,6 +1931,8 @@ int dpaa2_eth_set_hash(struct net_device *net_dev, u64 flags)
                key->extract.from_hdr.type = DPKG_FULL_FIELD;
                key->extract.from_hdr.field = hash_fields[i].cls_field;
                cls_cfg.num_extracts++;
+
+               priv->rx_hash_fields |= hash_fields[i].rxnfc_field;
        }
 
        dma_mem = kzalloc(DPAA2_CLASSIFIER_DMA_SIZE, GFP_DMA | GFP_KERNEL);
@@ -2360,6 +2364,8 @@ static int dpaa2_eth_probe(struct fsl_mc_device *dpni_dev)
        if (err)
                goto err_alloc_rings;
 
+       net_dev->ethtool_ops = &dpaa2_ethtool_ops;
+
        err = setup_irqs(dpni_dev);
        if (err) {
                netdev_warn(net_dev, "Failed to set link interrupt, fall back to polling\n");
index 7b194a47df2fe4392d1a2ae655b4b8775cec89db..b30231891eef2d2c89199c48c4f824b092e140f3 100644 (file)
@@ -281,6 +281,9 @@ struct dpaa2_eth_priv {
        struct dpni_link_state link_state;
        bool do_link_poll;
        struct task_struct *poll_thread;
+
+       /* enabled ethtool hashing bits */
+       u64 rx_hash_fields;
 };
 
 /* default Rx hash options, set during probing */
@@ -294,6 +297,9 @@ struct dpaa2_eth_priv {
 /* Required by struct dpni_rx_tc_dist_cfg::key_cfg_iova */
 #define DPAA2_CLASSIFIER_DMA_SIZE 256
 
+extern const struct ethtool_ops dpaa2_ethtool_ops;
+extern const char dpaa2_eth_drv_version[];
+
 int dpaa2_eth_set_hash(struct net_device *net_dev, u64 flags);
 
 static int dpaa2_eth_queue_count(struct dpaa2_eth_priv *priv)
diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-ethtool.c b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-ethtool.c
new file mode 100644 (file)
index 0000000..4378956
--- /dev/null
@@ -0,0 +1,234 @@
+/* Copyright 2014-2016 Freescale Semiconductor Inc.
+ * Copyright 2016 NXP
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Freescale Semiconductor nor the
+ *      names of its contributors may be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ *
+ * ALTERNATIVELY, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") as published by the Free Software
+ * Foundation, either version 2 of that License or (at your option) any
+ * later version.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "dpni.h"      /* DPNI_LINK_OPT_* */
+#include "dpaa2-eth.h"
+
+/* To be kept in sync with DPNI statistics */
+char dpaa2_ethtool_stats[][ETH_GSTRING_LEN] = {
+       "rx frames",
+       "rx bytes",
+       "rx mcast frames",
+       "rx mcast bytes",
+       "rx bcast frames",
+       "rx bcast bytes",
+       "tx frames",
+       "tx bytes",
+       "tx mcast frames",
+       "tx mcast bytes",
+       "tx bcast frames",
+       "tx bcast bytes",
+       "rx filtered frames",
+       "rx discarded frames",
+       "rx nobuffer discards",
+       "tx discarded frames",
+       "tx confirmed frames",
+};
+
+#define DPAA2_ETH_NUM_STATS    ARRAY_SIZE(dpaa2_ethtool_stats)
+
+static void dpaa2_eth_get_drvinfo(struct net_device *net_dev,
+                                 struct ethtool_drvinfo *drvinfo)
+{
+       strlcpy(drvinfo->driver, KBUILD_MODNAME, sizeof(drvinfo->driver));
+       strlcpy(drvinfo->version, dpaa2_eth_drv_version,
+               sizeof(drvinfo->version));
+       strlcpy(drvinfo->fw_version, "N/A", sizeof(drvinfo->fw_version));
+       strlcpy(drvinfo->bus_info, dev_name(net_dev->dev.parent->parent),
+               sizeof(drvinfo->bus_info));
+}
+
+static int
+dpaa2_eth_get_link_ksettings(struct net_device *net_dev,
+                            struct ethtool_link_ksettings *link_settings)
+{
+       struct dpni_link_state state = {0};
+       int err = 0;
+       struct dpaa2_eth_priv *priv = netdev_priv(net_dev);
+
+       err = dpni_get_link_state(priv->mc_io, 0, priv->mc_token, &state);
+       if (err) {
+               netdev_err(net_dev, "ERROR %d getting link state", err);
+               goto out;
+       }
+
+       /* At the moment, we have no way of interrogating the DPMAC
+        * from the DPNI side - and for that matter there may exist
+        * no DPMAC at all. So for now we just don't report anything
+        * beyond the DPNI attributes.
+        */
+       if (state.options & DPNI_LINK_OPT_AUTONEG)
+               link_settings->base.autoneg = AUTONEG_ENABLE;
+       if (!(state.options & DPNI_LINK_OPT_HALF_DUPLEX))
+               link_settings->base.duplex = DUPLEX_FULL;
+       link_settings->base.speed = state.rate;
+
+out:
+       return err;
+}
+
+static int
+dpaa2_eth_set_link_ksettings(struct net_device *net_dev,
+                            const struct ethtool_link_ksettings *link_settings)
+{
+       struct dpni_link_cfg cfg = {0};
+       struct dpaa2_eth_priv *priv = netdev_priv(net_dev);
+       int err = 0;
+
+       netdev_dbg(net_dev, "Setting link parameters...");
+
+       /* Due to a temporary MC limitation, the DPNI must be down
+        * in order to be able to change link settings. Taking steps to let
+        * the user know that.
+        */
+       if (netif_running(net_dev)) {
+               netdev_info(net_dev, "Sorry, interface must be brought down first.\n");
+               return -EACCES;
+       }
+
+       cfg.rate = link_settings->base.speed;
+       if (link_settings->base.autoneg == AUTONEG_ENABLE)
+               cfg.options |= DPNI_LINK_OPT_AUTONEG;
+       else
+               cfg.options &= ~DPNI_LINK_OPT_AUTONEG;
+       if (link_settings->base.duplex  == DUPLEX_HALF)
+               cfg.options |= DPNI_LINK_OPT_HALF_DUPLEX;
+       else
+               cfg.options &= ~DPNI_LINK_OPT_HALF_DUPLEX;
+
+       err = dpni_set_link_cfg(priv->mc_io, 0, priv->mc_token, &cfg);
+       if (err)
+               /* ethtool will be loud enough if we return an error; no point
+                * in putting our own error message on the console by default
+                */
+               netdev_dbg(net_dev, "ERROR %d setting link cfg", err);
+
+       return err;
+}
+
+static void dpaa2_eth_get_strings(struct net_device *netdev, u32 stringset,
+                                 u8 *data)
+{
+       u8 *p = data;
+       int i;
+
+       switch (stringset) {
+       case ETH_SS_STATS:
+               for (i = 0; i < DPAA2_ETH_NUM_STATS; i++) {
+                       strlcpy(p, dpaa2_ethtool_stats[i], ETH_GSTRING_LEN);
+                       p += ETH_GSTRING_LEN;
+               }
+               break;
+       }
+}
+
+static int dpaa2_eth_get_sset_count(struct net_device *net_dev, int sset)
+{
+       switch (sset) {
+       case ETH_SS_STATS: /* ethtool_get_stats(), ethtool_get_drvinfo() */
+               return DPAA2_ETH_NUM_STATS;
+       default:
+               return -EOPNOTSUPP;
+       }
+}
+
+/** Fill in hardware counters, as returned by MC.
+ */
+static void dpaa2_eth_get_ethtool_stats(struct net_device *net_dev,
+                                       struct ethtool_stats *stats,
+                                       u64 *data)
+{
+       int i = 0;
+       int j, k, err;
+       int num_cnt;
+       union dpni_statistics dpni_stats;
+       struct dpaa2_eth_priv *priv = netdev_priv(net_dev);
+
+       memset(data, 0, sizeof(u64) * DPAA2_ETH_NUM_STATS);
+
+       /* Print standard counters, from DPNI statistics */
+       for (j = 0; j <= 2; j++) {
+               err = dpni_get_statistics(priv->mc_io, 0, priv->mc_token,
+                                         j, &dpni_stats);
+               if (err != 0)
+                       netdev_warn(net_dev, "dpni_get_stats(%d) failed", j);
+               switch (j) {
+               case 0:
+                       num_cnt = sizeof(dpni_stats.page_0) / sizeof(u64);
+                       break;
+               case 1:
+                       num_cnt = sizeof(dpni_stats.page_1) / sizeof(u64);
+                       break;
+               case 2:
+                       num_cnt = sizeof(dpni_stats.page_2) / sizeof(u64);
+                       break;
+               default:
+                       break;
+               }
+               for (k = 0; k < num_cnt; k++)
+                       *(data + i++) = dpni_stats.raw.counter[k];
+       }
+}
+
+static int dpaa2_eth_get_rxnfc(struct net_device *net_dev,
+                              struct ethtool_rxnfc *rxnfc, u32 *rule_locs)
+{
+       struct dpaa2_eth_priv *priv = netdev_priv(net_dev);
+
+       switch (rxnfc->cmd) {
+       case ETHTOOL_GRXFH:
+               /* we purposely ignore cmd->flow_type for now, because the
+                * classifier only supports a single set of fields for all
+                * protocols
+                */
+               rxnfc->data = priv->rx_hash_fields;
+               break;
+       case ETHTOOL_GRXRINGS:
+               rxnfc->data = dpaa2_eth_queue_count(priv);
+               break;
+       default:
+               return -EOPNOTSUPP;
+       }
+
+       return 0;
+}
+
+const struct ethtool_ops dpaa2_ethtool_ops = {
+       .get_drvinfo = dpaa2_eth_get_drvinfo,
+       .get_link = ethtool_op_get_link,
+       .get_link_ksettings = dpaa2_eth_get_link_ksettings,
+       .set_link_ksettings = dpaa2_eth_set_link_ksettings,
+       .get_sset_count = dpaa2_eth_get_sset_count,
+       .get_ethtool_stats = dpaa2_eth_get_ethtool_stats,
+       .get_strings = dpaa2_eth_get_strings,
+       .get_rxnfc = dpaa2_eth_get_rxnfc,
+};