]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
dpaa_eth: add ethtool functionality
authorMadalin Bucur <madalin.bucur@nxp.com>
Tue, 15 Nov 2016 08:41:03 +0000 (10:41 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 16 Nov 2016 03:34:25 +0000 (22:34 -0500)
Add support for basic ethtool operations.

Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/freescale/dpaa/Makefile
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
drivers/net/ethernet/freescale/dpaa/dpaa_eth.h
drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c [new file with mode: 0644]

index fc76029281c75a7dfbfe93a2a5f488b879242c32..43a4cfdd2e78bf265c43319647b6d3843ea6b497 100644 (file)
@@ -8,4 +8,4 @@ ccflags-y += -I$(FMAN)
 
 obj-$(CONFIG_FSL_DPAA_ETH) += fsl_dpa.o
 
-fsl_dpa-objs += dpaa_eth.o
+fsl_dpa-objs += dpaa_eth.o dpaa_ethtool.o
index 8b9b0720f8b111d5ce536f66bbe977421fa2f215..0e7f1c7ff37aa20438e58fa710775d6661a4b1ce 100644 (file)
@@ -240,6 +240,8 @@ static int dpaa_netdev_init(struct net_device *net_dev,
        memcpy(net_dev->perm_addr, mac_addr, net_dev->addr_len);
        memcpy(net_dev->dev_addr, mac_addr, net_dev->addr_len);
 
+       net_dev->ethtool_ops = &dpaa_ethtool_ops;
+
        net_dev->needed_headroom = priv->tx_headroom;
        net_dev->watchdog_timeo = msecs_to_jiffies(tx_timeout);
 
index fe98e089cf4dd7b6174e440a28335e6b4d1696e1..d6ab3354df86ed420d435972c4b1ca58600c6b20 100644 (file)
@@ -141,4 +141,7 @@ struct dpaa_priv {
        struct dpaa_buffer_layout buf_layout[2];
        u16 rx_headroom;
 };
+
+/* from dpaa_ethtool.c */
+extern const struct ethtool_ops dpaa_ethtool_ops;
 #endif /* __DPAA_H */
diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c b/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c
new file mode 100644 (file)
index 0000000..3580a62
--- /dev/null
@@ -0,0 +1,218 @@
+/* Copyright 2008-2016 Freescale Semiconductor, Inc.
+ *
+ * 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.
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/string.h>
+
+#include "dpaa_eth.h"
+#include "mac.h"
+
+static int dpaa_get_settings(struct net_device *net_dev,
+                            struct ethtool_cmd *et_cmd)
+{
+       int err;
+
+       if (!net_dev->phydev) {
+               netdev_dbg(net_dev, "phy device not initialized\n");
+               return 0;
+       }
+
+       err = phy_ethtool_gset(net_dev->phydev, et_cmd);
+
+       return err;
+}
+
+static int dpaa_set_settings(struct net_device *net_dev,
+                            struct ethtool_cmd *et_cmd)
+{
+       int err;
+
+       if (!net_dev->phydev) {
+               netdev_err(net_dev, "phy device not initialized\n");
+               return -ENODEV;
+       }
+
+       err = phy_ethtool_sset(net_dev->phydev, et_cmd);
+       if (err < 0)
+               netdev_err(net_dev, "phy_ethtool_sset() = %d\n", err);
+
+       return err;
+}
+
+static void dpaa_get_drvinfo(struct net_device *net_dev,
+                            struct ethtool_drvinfo *drvinfo)
+{
+       int len;
+
+       strlcpy(drvinfo->driver, KBUILD_MODNAME,
+               sizeof(drvinfo->driver));
+       len = snprintf(drvinfo->version, sizeof(drvinfo->version),
+                      "%X", 0);
+       len = snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
+                      "%X", 0);
+
+       if (len >= sizeof(drvinfo->fw_version)) {
+               /* Truncated output */
+               netdev_notice(net_dev, "snprintf() = %d\n", len);
+       }
+       strlcpy(drvinfo->bus_info, dev_name(net_dev->dev.parent->parent),
+               sizeof(drvinfo->bus_info));
+}
+
+static u32 dpaa_get_msglevel(struct net_device *net_dev)
+{
+       return ((struct dpaa_priv *)netdev_priv(net_dev))->msg_enable;
+}
+
+static void dpaa_set_msglevel(struct net_device *net_dev,
+                             u32 msg_enable)
+{
+       ((struct dpaa_priv *)netdev_priv(net_dev))->msg_enable = msg_enable;
+}
+
+static int dpaa_nway_reset(struct net_device *net_dev)
+{
+       int err;
+
+       if (!net_dev->phydev) {
+               netdev_err(net_dev, "phy device not initialized\n");
+               return -ENODEV;
+       }
+
+       err = 0;
+       if (net_dev->phydev->autoneg) {
+               err = phy_start_aneg(net_dev->phydev);
+               if (err < 0)
+                       netdev_err(net_dev, "phy_start_aneg() = %d\n",
+                                  err);
+       }
+
+       return err;
+}
+
+static void dpaa_get_pauseparam(struct net_device *net_dev,
+                               struct ethtool_pauseparam *epause)
+{
+       struct mac_device *mac_dev;
+       struct dpaa_priv *priv;
+
+       priv = netdev_priv(net_dev);
+       mac_dev = priv->mac_dev;
+
+       if (!net_dev->phydev) {
+               netdev_err(net_dev, "phy device not initialized\n");
+               return;
+       }
+
+       epause->autoneg = mac_dev->autoneg_pause;
+       epause->rx_pause = mac_dev->rx_pause_active;
+       epause->tx_pause = mac_dev->tx_pause_active;
+}
+
+static int dpaa_set_pauseparam(struct net_device *net_dev,
+                              struct ethtool_pauseparam *epause)
+{
+       struct mac_device *mac_dev;
+       struct phy_device *phydev;
+       bool rx_pause, tx_pause;
+       struct dpaa_priv *priv;
+       u32 newadv, oldadv;
+       int err;
+
+       priv = netdev_priv(net_dev);
+       mac_dev = priv->mac_dev;
+
+       phydev = net_dev->phydev;
+       if (!phydev) {
+               netdev_err(net_dev, "phy device not initialized\n");
+               return -ENODEV;
+       }
+
+       if (!(phydev->supported & SUPPORTED_Pause) ||
+           (!(phydev->supported & SUPPORTED_Asym_Pause) &&
+           (epause->rx_pause != epause->tx_pause)))
+               return -EINVAL;
+
+       /* The MAC should know how to handle PAUSE frame autonegotiation before
+        * adjust_link is triggered by a forced renegotiation of sym/asym PAUSE
+        * settings.
+        */
+       mac_dev->autoneg_pause = !!epause->autoneg;
+       mac_dev->rx_pause_req = !!epause->rx_pause;
+       mac_dev->tx_pause_req = !!epause->tx_pause;
+
+       /* Determine the sym/asym advertised PAUSE capabilities from the desired
+        * rx/tx pause settings.
+        */
+       newadv = 0;
+       if (epause->rx_pause)
+               newadv = ADVERTISED_Pause | ADVERTISED_Asym_Pause;
+       if (epause->tx_pause)
+               newadv |= ADVERTISED_Asym_Pause;
+
+       oldadv = phydev->advertising &
+                       (ADVERTISED_Pause | ADVERTISED_Asym_Pause);
+
+       /* If there are differences between the old and the new advertised
+        * values, restart PHY autonegotiation and advertise the new values.
+        */
+       if (oldadv != newadv) {
+               phydev->advertising &= ~(ADVERTISED_Pause
+                               | ADVERTISED_Asym_Pause);
+               phydev->advertising |= newadv;
+               if (phydev->autoneg) {
+                       err = phy_start_aneg(phydev);
+                       if (err < 0)
+                               netdev_err(net_dev, "phy_start_aneg() = %d\n",
+                                          err);
+               }
+       }
+
+       fman_get_pause_cfg(mac_dev, &rx_pause, &tx_pause);
+       err = fman_set_mac_active_pause(mac_dev, rx_pause, tx_pause);
+       if (err < 0)
+               netdev_err(net_dev, "set_mac_active_pause() = %d\n", err);
+
+       return err;
+}
+
+const struct ethtool_ops dpaa_ethtool_ops = {
+       .get_settings = dpaa_get_settings,
+       .set_settings = dpaa_set_settings,
+       .get_drvinfo = dpaa_get_drvinfo,
+       .get_msglevel = dpaa_get_msglevel,
+       .set_msglevel = dpaa_set_msglevel,
+       .nway_reset = dpaa_nway_reset,
+       .get_pauseparam = dpaa_get_pauseparam,
+       .set_pauseparam = dpaa_set_pauseparam,
+       .get_link = ethtool_op_get_link,
+};