target/linux/generic/backport-5.15/766-13-net-dsa-qca8k-move-page-cache-to-driver-priv.patch

   1 From 4264350acb75430d5021a1d7de56a33faf69a097 Mon Sep 17 00:00:00 2001
   2 From: Ansuel Smith <ansuelsmth@gmail.com>
   3 Date: Wed, 2 Feb 2022 01:03:32 +0100
   4 Subject: [PATCH 13/16] net: dsa: qca8k: move page cache to driver priv
   5
   6 There can be multiple qca8k switch on the same system. Move the static
   7 qca8k_current_page to qca8k_priv and make it specific for each switch.
   8
   9 Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
  10 Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
  11 Signed-off-by: David S. Miller <davem@davemloft.net>
  12 ---
  13  drivers/net/dsa/qca8k.c | 42 ++++++++++++++++++++---------------------
  14  drivers/net/dsa/qca8k.h |  9 +++++++++
  15  2 files changed, 29 insertions(+), 22 deletions(-)
  16
  17 --- a/drivers/net/dsa/qca8k.c
  18 +++ b/drivers/net/dsa/qca8k.c
  19 @@ -75,12 +75,6 @@ static const struct qca8k_mib_desc ar832
  20         MIB_DESC(1, 0xac, "TXUnicast"),
  21  };
  22
  23 -/* The 32bit switch registers are accessed indirectly. To achieve this we need
  24 - * to set the page of the register. Track the last page that was set to reduce
  25 - * mdio writes
  26 - */
  27 -static u16 qca8k_current_page = 0xffff;
  28 -
  29  static void
  30  qca8k_split_addr(u32 regaddr, u16 *r1, u16 *r2, u16 *page)
  31  {
  32 @@ -134,11 +128,13 @@ qca8k_mii_write32(struct mii_bus *bus, i
  33  }
  34
  35  static int
  36 -qca8k_set_page(struct mii_bus *bus, u16 page)
  37 +qca8k_set_page(struct qca8k_priv *priv, u16 page)
  38  {
  39 +       u16 *cached_page = &priv->mdio_cache.page;
  40 +       struct mii_bus *bus = priv->bus;
  41         int ret;
  42
  43 -       if (page == qca8k_current_page)
  44 +       if (page == *cached_page)
  45                 return 0;
  46
  47         ret = bus->write(bus, 0x18, 0, page);
  48 @@ -148,7 +144,7 @@ qca8k_set_page(struct mii_bus *bus, u16
  49                 return ret;
  50         }
  51
  52 -       qca8k_current_page = page;
  53 +       *cached_page = page;
  54         usleep_range(1000, 2000);
  55         return 0;
  56  }
  57 @@ -374,7 +370,7 @@ qca8k_regmap_read(void *ctx, uint32_t re
  58
  59         mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
  60
  61 -       ret = qca8k_set_page(bus, page);
  62 +       ret = qca8k_set_page(priv, page);
  63         if (ret < 0)
  64                 goto exit;
  65
  66 @@ -400,7 +396,7 @@ qca8k_regmap_write(void *ctx, uint32_t r
  67
  68         mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
  69
  70 -       ret = qca8k_set_page(bus, page);
  71 +       ret = qca8k_set_page(priv, page);
  72         if (ret < 0)
  73                 goto exit;
  74
  75 @@ -427,7 +423,7 @@ qca8k_regmap_update_bits(void *ctx, uint
  76
  77         mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
  78
  79 -       ret = qca8k_set_page(bus, page);
  80 +       ret = qca8k_set_page(priv, page);
  81         if (ret < 0)
  82                 goto exit;
  83
  84 @@ -1098,8 +1094,9 @@ qca8k_mdio_busy_wait(struct mii_bus *bus
  85  }
  86
  87  static int
  88 -qca8k_mdio_write(struct mii_bus *bus, int phy, int regnum, u16 data)
  89 +qca8k_mdio_write(struct qca8k_priv *priv, int phy, int regnum, u16 data)
  90  {
  91 +       struct mii_bus *bus = priv->bus;
  92         u16 r1, r2, page;
  93         u32 val;
  94         int ret;
  95 @@ -1116,7 +1113,7 @@ qca8k_mdio_write(struct mii_bus *bus, in
  96
  97         mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
  98
  99 -       ret = qca8k_set_page(bus, page);
 100 +       ret = qca8k_set_page(priv, page);
 101         if (ret)
 102                 goto exit;
 103
 104 @@ -1135,8 +1132,9 @@ exit:
 105  }
 106
 107  static int
 108 -qca8k_mdio_read(struct mii_bus *bus, int phy, int regnum)
 109 +qca8k_mdio_read(struct qca8k_priv *priv, int phy, int regnum)
 110  {
 111 +       struct mii_bus *bus = priv->bus;
 112         u16 r1, r2, page;
 113         u32 val;
 114         int ret;
 115 @@ -1152,7 +1150,7 @@ qca8k_mdio_read(struct mii_bus *bus, int
 116
 117         mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
 118
 119 -       ret = qca8k_set_page(bus, page);
 120 +       ret = qca8k_set_page(priv, page);
 121         if (ret)
 122                 goto exit;
 123
 124 @@ -1181,7 +1179,6 @@ static int
 125  qca8k_internal_mdio_write(struct mii_bus *slave_bus, int phy, int regnum, u16 data)
 126  {
 127         struct qca8k_priv *priv = slave_bus->priv;
 128 -       struct mii_bus *bus = priv->bus;
 129         int ret;
 130
 131         /* Use mdio Ethernet when available, fallback to legacy one on error */
 132 @@ -1189,14 +1186,13 @@ qca8k_internal_mdio_write(struct mii_bus
 133         if (!ret)
 134                 return 0;
 135
 136 -       return qca8k_mdio_write(bus, phy, regnum, data);
 137 +       return qca8k_mdio_write(priv, phy, regnum, data);
 138  }
 139
 140  static int
 141  qca8k_internal_mdio_read(struct mii_bus *slave_bus, int phy, int regnum)
 142  {
 143         struct qca8k_priv *priv = slave_bus->priv;
 144 -       struct mii_bus *bus = priv->bus;
 145         int ret;
 146
 147         /* Use mdio Ethernet when available, fallback to legacy one on error */
 148 @@ -1204,7 +1200,7 @@ qca8k_internal_mdio_read(struct mii_bus
 149         if (ret >= 0)
 150                 return ret;
 151
 152 -       return qca8k_mdio_read(bus, phy, regnum);
 153 +       return qca8k_mdio_read(priv, phy, regnum);
 154  }
 155
 156  static int
 157 @@ -1225,7 +1221,7 @@ qca8k_phy_write(struct dsa_switch *ds, i
 158         if (!ret)
 159                 return ret;
 160
 161 -       return qca8k_mdio_write(priv->bus, port, regnum, data);
 162 +       return qca8k_mdio_write(priv, port, regnum, data);
 163  }
 164
 165  static int
 166 @@ -1246,7 +1242,7 @@ qca8k_phy_read(struct dsa_switch *ds, in
 167         if (ret >= 0)
 168                 return ret;
 169
 170 -       ret = qca8k_mdio_read(priv->bus, port, regnum);
 171 +       ret = qca8k_mdio_read(priv, port, regnum);
 172
 173         if (ret < 0)
 174                 return 0xffff;
 175 @@ -3041,6 +3037,8 @@ qca8k_sw_probe(struct mdio_device *mdiod
 176                 return PTR_ERR(priv->regmap);
 177         }
 178
 179 +       priv->mdio_cache.page = 0xffff;
 180 +
 181         /* Check the detected switch id */
 182         ret = qca8k_read_switch_id(priv);
 183         if (ret)
 184 --- a/drivers/net/dsa/qca8k.h
 185 +++ b/drivers/net/dsa/qca8k.h
 186 @@ -363,6 +363,14 @@ struct qca8k_ports_config {
 187         u8 rgmii_tx_delay[QCA8K_NUM_CPU_PORTS]; /* 0: CPU port0, 1: CPU port6 */
 188  };
 189
 190 +struct qca8k_mdio_cache {
 191 +/* The 32bit switch registers are accessed indirectly. To achieve this we need
 192 + * to set the page of the register. Track the last page that was set to reduce
 193 + * mdio writes
 194 + */
 195 +       u16 page;
 196 +};
 197 +
 198  struct qca8k_priv {
 199         u8 switch_id;
 200         u8 switch_revision;
 201 @@ -383,6 +391,7 @@ struct qca8k_priv {
 202         struct net_device *mgmt_master; /* Track if mdio/mib Ethernet is available */
 203         struct qca8k_mgmt_eth_data mgmt_eth_data;
 204         struct qca8k_mib_eth_data mib_eth_data;
 205 +       struct qca8k_mdio_cache mdio_cache;
 206  };
 207
 208  struct qca8k_mib_desc {