dpaa2-eth: Remove support for changing link settings

We only support fixed-link for now, so there is no point in
offering users the option to change link settings via ethtool.

Functionally there is no change, since firmware prevents us from
changing link parameters anyway.

Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c
index 7b182f4b263c4b969393cd705514c882fb60df11..5c9816be640d3835cc4b940e154c28e1b070aa7c 100644 (file)
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c
@@ -88,13 +88,7 @@ dpaa2_eth_get_link_ksettings(struct net_device *net_dev,
                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;
+       link_settings->base.autoneg = AUTONEG_DISABLE;
        if (!(state.options & DPNI_LINK_OPT_HALF_DUPLEX))
                link_settings->base.duplex = DUPLEX_FULL;
        link_settings->base.speed = state.rate;
@@ -103,48 +97,6 @@ out:
        return err;
 }
 
-#define DPNI_DYNAMIC_LINK_SET_VER_MAJOR                7
-#define DPNI_DYNAMIC_LINK_SET_VER_MINOR                1
-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;
-
-       /* If using an older MC version, the DPNI must be down
-        * in order to be able to change link settings. Taking steps to let
-        * the user know that.
-        */
-       if (dpaa2_eth_cmp_dpni_ver(priv, DPNI_DYNAMIC_LINK_SET_VER_MAJOR,
-                                  DPNI_DYNAMIC_LINK_SET_VER_MINOR) < 0) {
-               if (netif_running(net_dev)) {
-                       netdev_info(net_dev, "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\n", err);
-
-       return err;
-}
-
 static void dpaa2_eth_get_strings(struct net_device *netdev, u32 stringset,
                                  u8 *data)
 {
@@ -721,7 +673,6 @@ 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,