target/linux/layerscape/patches-5.4/701-net-0181-staging-dpaa2-evb-Improve-ethtool-support.patch

   1 From b505f9a736c3850aa1dfefd7a803d797c2233aab Mon Sep 17 00:00:00 2001
   2 From: Razvan Stefanescu <razvan.stefanescu@nxp.com>
   3 Date: Thu, 13 Apr 2017 13:10:34 +0300
   4 Subject: [PATCH] staging: dpaa2-evb: Improve ethtool support
   5
   6 Improve ethtool support by adding ops for:
   7 - driver info
   8 - link status
   9 - auto-negotiation setting and result
  10 - speed setting and result
  11
  12 Signed-off-by: Razvan Stefanescu <razvan.stefanescu@nxp.com>
  13 ---
  14  drivers/staging/fsl-dpaa2/evb/evb.c | 114 ++++++++++++++++++++++++++++++++++++
  15  1 file changed, 114 insertions(+)
  16
  17 --- a/drivers/staging/fsl-dpaa2/evb/evb.c
  18 +++ b/drivers/staging/fsl-dpaa2/evb/evb.c
  19 @@ -43,6 +43,8 @@
  20  #include "dpdmux.h"
  21  #include "dpdmux-cmd.h"
  22
  23 +static const char evb_drv_version[] = "0.1";
  24 +
  25  /* Minimal supported DPDMUX version */
  26  #define DPDMUX_MIN_VER_MAJOR                   6
  27  #define DPDMUX_MIN_VER_MINOR                   0
  28 @@ -860,6 +862,114 @@ static const struct net_device_ops evb_p
  29         .ndo_change_mtu         = &evb_change_mtu,
  30  };
  31
  32 +static void evb_get_drvinfo(struct net_device *netdev,
  33 +                           struct ethtool_drvinfo *drvinfo)
  34 +{
  35 +       struct evb_port_priv *port_priv = netdev_priv(netdev);
  36 +       u16 version_major, version_minor;
  37 +       int err;
  38 +
  39 +       strlcpy(drvinfo->driver, KBUILD_MODNAME, sizeof(drvinfo->driver));
  40 +       strlcpy(drvinfo->version, evb_drv_version, sizeof(drvinfo->version));
  41 +
  42 +       err = dpdmux_get_api_version(port_priv->evb_priv->mc_io, 0,
  43 +                                    &version_major,
  44 +                                    &version_minor);
  45 +       if (err)
  46 +               strlcpy(drvinfo->fw_version, "N/A",
  47 +                       sizeof(drvinfo->fw_version));
  48 +       else
  49 +               snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
  50 +                        "%u.%u", version_major, version_minor);
  51 +
  52 +       strlcpy(drvinfo->bus_info, dev_name(netdev->dev.parent->parent),
  53 +               sizeof(drvinfo->bus_info));
  54 +}
  55 +
  56 +static int evb_get_link_ksettings(struct net_device *netdev,
  57 +                                 struct ethtool_link_ksettings *link_settings)
  58 +{
  59 +       struct evb_port_priv *port_priv = netdev_priv(netdev);
  60 +       struct dpdmux_link_state state = {0};
  61 +       int err = 0;
  62 +
  63 +       err = dpdmux_if_get_link_state(port_priv->evb_priv->mc_io, 0,
  64 +                                      port_priv->evb_priv->mux_handle,
  65 +                                      port_priv->port_index,
  66 +                                      &state);
  67 +       if (err) {
  68 +               netdev_err(netdev, "ERROR %d getting link state", err);
  69 +               goto out;
  70 +       }
  71 +
  72 +       /* At the moment, we have no way of interrogating the DPMAC
  73 +        * from the DPDMUX side or there may not exist a DPMAC at all.
  74 +        * Report only autoneg state, duplexity and speed.
  75 +        */
  76 +       if (state.options & DPDMUX_LINK_OPT_AUTONEG)
  77 +               link_settings->base.autoneg = AUTONEG_ENABLE;
  78 +       if (!(state.options & DPDMUX_LINK_OPT_HALF_DUPLEX))
  79 +               link_settings->base.duplex = DUPLEX_FULL;
  80 +       link_settings->base.speed = state.rate;
  81 +
  82 +out:
  83 +       return err;
  84 +}
  85 +
  86 +static int evb_set_link_ksettings(struct net_device *netdev,
  87 +                                 const struct ethtool_link_ksettings *link_settings)
  88 +{
  89 +       struct evb_port_priv *port_priv = netdev_priv(netdev);
  90 +       struct dpdmux_link_state state = {0};
  91 +       struct dpdmux_link_cfg cfg = {0};
  92 +       int err = 0;
  93 +
  94 +       netdev_dbg(netdev, "Setting link parameters...");
  95 +
  96 +       err = dpdmux_if_get_link_state(port_priv->evb_priv->mc_io, 0,
  97 +                                      port_priv->evb_priv->mux_handle,
  98 +                                      port_priv->port_index,
  99 +                                      &state);
 100 +       if (err) {
 101 +               netdev_err(netdev, "ERROR %d getting link state", err);
 102 +               goto out;
 103 +       }
 104 +
 105 +       /* Due to a temporary MC limitation, the DPDMUX port must be down
 106 +        * in order to be able to change link settings. Taking steps to let
 107 +        * the user know that.
 108 +        */
 109 +       if (netif_running(netdev)) {
 110 +               netdev_info(netdev,
 111 +                           "Sorry, interface must be brought down first.\n");
 112 +               return -EACCES;
 113 +       }
 114 +
 115 +       cfg.options = state.options;
 116 +       cfg.rate = link_settings->base.speed;
 117 +       if (link_settings->base.autoneg == AUTONEG_ENABLE)
 118 +               cfg.options |= DPDMUX_LINK_OPT_AUTONEG;
 119 +       else
 120 +               cfg.options &= ~DPDMUX_LINK_OPT_AUTONEG;
 121 +       if (link_settings->base.duplex == DUPLEX_HALF)
 122 +               cfg.options |= DPDMUX_LINK_OPT_HALF_DUPLEX;
 123 +       else
 124 +               cfg.options &= ~DPDMUX_LINK_OPT_HALF_DUPLEX;
 125 +
 126 +       err = dpdmux_if_set_link_cfg(port_priv->evb_priv->mc_io, 0,
 127 +                                    port_priv->evb_priv->mux_handle,
 128 +                                    port_priv->port_index,
 129 +                                    &cfg);
 130 +       if (err)
 131 +               /* ethtool will be loud enough if we return an error; no point
 132 +                * in putting our own error message on the console by default
 133 +                */
 134 +               netdev_dbg(netdev, "ERROR %d setting link cfg", err);
 135 +
 136 +out:
 137 +       return err;
 138 +}
 139 +
 140  static struct {
 141         enum dpdmux_counter_type id;
 142         char name[ETH_GSTRING_LEN];
 143 @@ -923,6 +1033,10 @@ static void evb_ethtool_get_stats(struct
 144  }
 145
 146  static const struct ethtool_ops evb_port_ethtool_ops = {
 147 +       .get_drvinfo            = &evb_get_drvinfo,
 148 +       .get_link               = &ethtool_op_get_link,
 149 +       .get_link_ksettings     = &evb_get_link_ksettings,
 150 +       .set_link_ksettings     = &evb_set_link_ksettings,
 151         .get_strings            = &evb_ethtool_get_strings,
 152         .get_ethtool_stats      = &evb_ethtool_get_stats,
 153         .get_sset_count         = &evb_ethtool_get_sset_count,