target/linux/layerscape/patches-5.4/701-net-0216-dpaa2-eth-Add-autoneg-support.patch

   1 From c6365855a6d9aef3b75e301d26872bc51398c2f3 Mon Sep 17 00:00:00 2001
   2 From: Ioana Radulescu <ruxandra.radulescu@nxp.com>
   3 Date: Thu, 18 Oct 2018 18:59:41 +0300
   4 Subject: [PATCH] dpaa2-eth: Add autoneg support
   5
   6 For MC versions that support it, use the new DPNI link APIs, which
   7 allow setting/getting of advertised and supported link modes.
   8
   9 A mapping between DPNI link modes and ethtool ones is created to
  10 help converting from one to the other.
  11
  12 Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
  13 Signed-off-by: Valentin Catalin Neacsu <valentin-catalin.neacsu@nxp.com>
  14 ---
  15  drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c   |  8 ++-
  16  drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h   |  3 ++
  17  .../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c   | 57 ++++++++++++++++++++--
  18  3 files changed, 62 insertions(+), 6 deletions(-)
  19
  20 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
  21 +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
  22 @@ -1357,7 +1357,13 @@ static int link_state_update(struct dpaa
  23         bool tx_pause;
  24         int err;
  25
  26 -       err = dpni_get_link_state(priv->mc_io, 0, priv->mc_token, &state);
  27 +       if (dpaa2_eth_cmp_dpni_ver(priv, DPNI_LINK_AUTONEG_VER_MAJOR,
  28 +                                  DPNI_LINK_AUTONEG_VER_MINOR) < 0)
  29 +               err = dpni_get_link_state(priv->mc_io, 0, priv->mc_token,
  30 +                                         &state);
  31 +       else
  32 +               err = dpni_get_link_state_v2(priv->mc_io, 0, priv->mc_token,
  33 +                                            &state);
  34         if (unlikely(err)) {
  35                 netdev_err(priv->net_dev,
  36                            "dpni_get_link_state() failed\n");
  37 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h
  38 +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h
  39 @@ -543,6 +543,9 @@ static inline bool dpaa2_eth_rx_pause_en
  40         return !!(link_options & DPNI_LINK_OPT_PAUSE);
  41  }
  42
  43 +#define DPNI_LINK_AUTONEG_VER_MAJOR    7
  44 +#define DPNI_LINK_AUTONEG_VER_MINOR    8
  45 +
  46  static inline
  47  unsigned int dpaa2_eth_needed_headroom(struct dpaa2_eth_priv *priv,
  48                                        struct sk_buff *skb)
  49 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c
  50 +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c
  51 @@ -79,6 +79,41 @@ static void dpaa2_eth_get_drvinfo(struct
  52                 sizeof(drvinfo->bus_info));
  53  }
  54
  55 +struct dpaa2_eth_link_mode_map {
  56 +       u64 dpni_lm;
  57 +       u64 ethtool_lm;
  58 +};
  59 +
  60 +static const struct dpaa2_eth_link_mode_map dpaa2_eth_lm_map[] = {
  61 +       {DPNI_ADVERTISED_10BASET_FULL, ETHTOOL_LINK_MODE_10baseT_Full_BIT},
  62 +       {DPNI_ADVERTISED_100BASET_FULL, ETHTOOL_LINK_MODE_100baseT_Full_BIT},
  63 +       {DPNI_ADVERTISED_1000BASET_FULL, ETHTOOL_LINK_MODE_1000baseT_Full_BIT},
  64 +       {DPNI_ADVERTISED_10000BASET_FULL, ETHTOOL_LINK_MODE_10000baseT_Full_BIT},
  65 +       {DPNI_ADVERTISED_2500BASEX_FULL, ETHTOOL_LINK_MODE_2500baseT_Full_BIT},
  66 +       {DPNI_ADVERTISED_AUTONEG, ETHTOOL_LINK_MODE_Autoneg_BIT},
  67 +};
  68 +
  69 +static void link_mode_dpni2ethtool(u64 dpni_lm, unsigned long *ethtool_lm)
  70 +{
  71 +       int i;
  72 +
  73 +       for (i = 0; i < ARRAY_SIZE(dpaa2_eth_lm_map); i++) {
  74 +               if (dpni_lm & dpaa2_eth_lm_map[i].dpni_lm)
  75 +                       __set_bit(dpaa2_eth_lm_map[i].ethtool_lm, ethtool_lm);
  76 +       }
  77 +}
  78 +
  79 +static void link_mode_ethtool2dpni(const unsigned long *ethtool_lm,
  80 +                                  u64 *dpni_lm)
  81 +{
  82 +       int i;
  83 +
  84 +       for (i = 0; i < ARRAY_SIZE(dpaa2_eth_lm_map); i++) {
  85 +               if (test_bit(dpaa2_eth_lm_map[i].ethtool_lm, ethtool_lm))
  86 +                       *dpni_lm |= dpaa2_eth_lm_map[i].dpni_lm;
  87 +       }
  88 +}
  89 +
  90  static int
  91  dpaa2_eth_get_link_ksettings(struct net_device *net_dev,
  92                              struct ethtool_link_ksettings *link_settings)
  93 @@ -91,6 +126,14 @@ dpaa2_eth_get_link_ksettings(struct net_
  94                 link_settings->base.duplex = DUPLEX_FULL;
  95         link_settings->base.speed = priv->link_state.rate;
  96
  97 +       if (dpaa2_eth_cmp_dpni_ver(priv, DPNI_LINK_AUTONEG_VER_MAJOR,
  98 +                                  DPNI_LINK_AUTONEG_VER_MINOR) >= 0) {
  99 +               link_mode_dpni2ethtool(priv->link_state.supported,
 100 +                                      link_settings->link_modes.supported);
 101 +               link_mode_dpni2ethtool(priv->link_state.advertising,
 102 +                                      link_settings->link_modes.advertising);
 103 +       }
 104 +
 105         return 0;
 106  }
 107
 108 @@ -127,12 +170,16 @@ dpaa2_eth_set_link_ksettings(struct net_
 109         else
 110                 cfg.options &= ~DPNI_LINK_OPT_HALF_DUPLEX;
 111
 112 -       err = dpni_set_link_cfg(priv->mc_io, 0, priv->mc_token, &cfg);
 113 +       if (dpaa2_eth_cmp_dpni_ver(priv, DPNI_LINK_AUTONEG_VER_MAJOR,
 114 +                                  DPNI_LINK_AUTONEG_VER_MINOR) < 0) {
 115 +               err = dpni_set_link_cfg(priv->mc_io, 0, priv->mc_token, &cfg);
 116 +       } else {
 117 +               link_mode_ethtool2dpni(link_settings->link_modes.advertising,
 118 +                                      &cfg.advertising);
 119 +               dpni_set_link_cfg_v2(priv->mc_io, 0, priv->mc_token, &cfg);
 120 +       }
 121         if (err)
 122 -               /* ethtool will be loud enough if we return an error; no point
 123 -                * in putting our own error message on the console by default
 124 -                */
 125 -               netdev_dbg(net_dev, "ERROR %d setting link cfg\n", err);
 126 +               netdev_err(net_dev, "dpni_set_link_cfg failed");
 127
 128         return err;
 129  }