target/linux/generic/backport-5.4/781-v5.13-net-dsa-mt7530-Add-support-for-EEE-features.patch

   1 From 40b5d2f15c091fa9c854acde91ad2acb504027d7 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Ren=C3=A9=20van=20Dorst?= <opensource@vdorst.com>
   3 Date: Mon, 12 Apr 2021 08:50:31 +0200
   4 Subject: [PATCH] net: dsa: mt7530: Add support for EEE features
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 This patch adds EEE support.
  10
  11 Signed-off-by: René van Dorst <opensource@vdorst.com>
  12 Signed-off-by: David S. Miller <davem@davemloft.net>
  13 ---
  14  drivers/net/dsa/mt7530.c | 46 +++++++++++++++++++++++++++++++++++++++-
  15  drivers/net/dsa/mt7530.h | 11 ++++++++++
  16  2 files changed, 56 insertions(+), 1 deletion(-)
  17
  18 --- a/drivers/net/dsa/mt7530.c
  19 +++ b/drivers/net/dsa/mt7530.c
  20 @@ -1406,7 +1406,8 @@ static void mt7530_phylink_mac_config(st
  21         mcr_cur = mt7530_read(priv, MT7530_PMCR_P(port));
  22         mcr_new = mcr_cur;
  23         mcr_new &= ~(PMCR_FORCE_SPEED_1000 | PMCR_FORCE_SPEED_100 |
  24 -                    PMCR_FORCE_FDX | PMCR_TX_FC_EN | PMCR_RX_FC_EN);
  25 +                    PMCR_FORCE_FDX | PMCR_TX_FC_EN | PMCR_RX_FC_EN |
  26 +                    PMCR_FORCE_EEE1G | PMCR_FORCE_EEE100);
  27         mcr_new |= PMCR_IFG_XMIT(1) | PMCR_MAC_MODE | PMCR_BACKOFF_EN |
  28                    PMCR_BACKPR_EN | PMCR_FORCE_MODE;
  29
  30 @@ -1430,6 +1431,17 @@ static void mt7530_phylink_mac_config(st
  31                         mcr_new |= PMCR_RX_FC_EN;
  32         }
  33
  34 +       if (mode == MLO_AN_PHY) {
  35 +               switch (state->speed) {
  36 +               case SPEED_1000:
  37 +                       mcr_new |= PMCR_FORCE_EEE1G;
  38 +                       break;
  39 +               case SPEED_100:
  40 +                       mcr_new |= PMCR_FORCE_EEE100;
  41 +                       break;
  42 +               }
  43 +       }
  44 +
  45         if (mcr_new != mcr_cur)
  46                 mt7530_write(priv, MT7530_PMCR_P(port), mcr_new);
  47  }
  48 @@ -1555,6 +1567,36 @@ mt7530_phylink_mac_link_state(struct dsa
  49         return 1;
  50  }
  51
  52 +static int mt753x_get_mac_eee(struct dsa_switch *ds, int port,
  53 +                             struct ethtool_eee *e)
  54 +{
  55 +       struct mt7530_priv *priv = ds->priv;
  56 +       u32 eeecr = mt7530_read(priv, MT7530_PMEEECR_P(port));
  57 +
  58 +       e->tx_lpi_enabled = !(eeecr & LPI_MODE_EN);
  59 +       e->tx_lpi_timer = GET_LPI_THRESH(eeecr);
  60 +
  61 +       return 0;
  62 +}
  63 +
  64 +static int mt753x_set_mac_eee(struct dsa_switch *ds, int port,
  65 +                             struct ethtool_eee *e)
  66 +{
  67 +       struct mt7530_priv *priv = ds->priv;
  68 +       u32 set, mask = LPI_THRESH_MASK | LPI_MODE_EN;
  69 +
  70 +       if (e->tx_lpi_timer > 0xFFF)
  71 +               return -EINVAL;
  72 +
  73 +       set = SET_LPI_THRESH(e->tx_lpi_timer);
  74 +       if (!e->tx_lpi_enabled)
  75 +               /* Force LPI Mode without a delay */
  76 +               set |= LPI_MODE_EN;
  77 +       mt7530_rmw(priv, MT7530_PMEEECR_P(port), mask, set);
  78 +
  79 +       return 0;
  80 +}
  81 +
  82  static const struct dsa_switch_ops mt7530_switch_ops = {
  83         .get_tag_protocol       = mtk_get_tag_protocol,
  84         .setup                  = mt7530_setup,
  85 @@ -1582,6 +1624,8 @@ static const struct dsa_switch_ops mt753
  86         .phylink_mac_config     = mt7530_phylink_mac_config,
  87         .phylink_mac_link_down  = mt7530_phylink_mac_link_down,
  88         .phylink_mac_link_up    = mt7530_phylink_mac_link_up,
  89 +       .get_mac_eee            = mt753x_get_mac_eee,
  90 +       .set_mac_eee            = mt753x_set_mac_eee,
  91  };
  92
  93  static const struct of_device_id mt7530_of_match[] = {
  94 --- a/drivers/net/dsa/mt7530.h
  95 +++ b/drivers/net/dsa/mt7530.h
  96 @@ -212,6 +212,8 @@ enum mt7530_vlan_port_attr {
  97  #define  PMCR_RX_EN                    BIT(13)
  98  #define  PMCR_BACKOFF_EN               BIT(9)
  99  #define  PMCR_BACKPR_EN                        BIT(8)
 100 +#define  PMCR_FORCE_EEE1G              BIT(7)
 101 +#define  PMCR_FORCE_EEE100             BIT(6)
 102  #define  PMCR_TX_FC_EN                 BIT(5)
 103  #define  PMCR_RX_FC_EN                 BIT(4)
 104  #define  PMCR_FORCE_SPEED_1000         BIT(3)
 105 @@ -221,6 +223,15 @@ enum mt7530_vlan_port_attr {
 106  #define  PMCR_SPEED_MASK               (PMCR_FORCE_SPEED_100 | \
 107                                          PMCR_FORCE_SPEED_1000)
 108
 109 +#define MT7530_PMEEECR_P(x)            (0x3004 + (x) * 0x100)
 110 +#define  WAKEUP_TIME_1000(x)           (((x) & 0xFF) << 24)
 111 +#define  WAKEUP_TIME_100(x)            (((x) & 0xFF) << 16)
 112 +#define  LPI_THRESH_MASK               GENMASK(15, 4)
 113 +#define  LPI_THRESH_SHT                        4
 114 +#define  SET_LPI_THRESH(x)             (((x) << LPI_THRESH_SHT) & LPI_THRESH_MASK)
 115 +#define  GET_LPI_THRESH(x)             (((x) & LPI_THRESH_MASK) >> LPI_THRESH_SHT)
 116 +#define  LPI_MODE_EN                   BIT(0)
 117 +
 118  #define MT7530_PMSR_P(x)               (0x3008 + (x) * 0x100)
 119  #define  PMSR_EEE1G                    BIT(7)
 120  #define  PMSR_EEE100M                  BIT(6)