target/linux/generic/backport-6.1/790-v6.4-0006-net-dsa-mt7530-introduce-mutex-helpers.patch

   1 From e4729ae7c095c0c87794bff47ea43e35d69de986 Mon Sep 17 00:00:00 2001
   2 From: Daniel Golle <daniel@makrotopia.org>
   3 Date: Mon, 3 Apr 2023 02:18:16 +0100
   4 Subject: [PATCH 06/13] net: dsa: mt7530: introduce mutex helpers
   5
   6 As the MDIO bus lock only needs to be involved if actually operating
   7 on an MDIO-connected switch we will need to skip locking for built-in
   8 switches which are accessed via MMIO.
   9 Create helper functions which simplify that upcoming change.
  10
  11 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  12 Reviewed-by: Andrew Lunn <andrew@lunn.ch>
  13 Signed-off-by: David S. Miller <davem@davemloft.net>
  14 ---
  15  drivers/net/dsa/mt7530.c | 73 ++++++++++++++++++++--------------------
  16  1 file changed, 36 insertions(+), 37 deletions(-)
  17
  18 --- a/drivers/net/dsa/mt7530.c
  19 +++ b/drivers/net/dsa/mt7530.c
  20 @@ -143,31 +143,40 @@ err:
  21  }
  22
  23  static void
  24 -core_write(struct mt7530_priv *priv, u32 reg, u32 val)
  25 +mt7530_mutex_lock(struct mt7530_priv *priv)
  26  {
  27 -       struct mii_bus *bus = priv->bus;
  28 +       mutex_lock_nested(&priv->bus->mdio_lock, MDIO_MUTEX_NESTED);
  29 +}
  30
  31 -       mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
  32 +static void
  33 +mt7530_mutex_unlock(struct mt7530_priv *priv)
  34 +{
  35 +       mutex_unlock(&priv->bus->mdio_lock);
  36 +}
  37 +
  38 +static void
  39 +core_write(struct mt7530_priv *priv, u32 reg, u32 val)
  40 +{
  41 +       mt7530_mutex_lock(priv);
  42
  43         core_write_mmd_indirect(priv, reg, MDIO_MMD_VEND2, val);
  44
  45 -       mutex_unlock(&bus->mdio_lock);
  46 +       mt7530_mutex_unlock(priv);
  47  }
  48
  49  static void
  50  core_rmw(struct mt7530_priv *priv, u32 reg, u32 mask, u32 set)
  51  {
  52 -       struct mii_bus *bus = priv->bus;
  53         u32 val;
  54
  55 -       mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
  56 +       mt7530_mutex_lock(priv);
  57
  58         val = core_read_mmd_indirect(priv, reg, MDIO_MMD_VEND2);
  59         val &= ~mask;
  60         val |= set;
  61         core_write_mmd_indirect(priv, reg, MDIO_MMD_VEND2, val);
  62
  63 -       mutex_unlock(&bus->mdio_lock);
  64 +       mt7530_mutex_unlock(priv);
  65  }
  66
  67  static void
  68 @@ -264,13 +273,11 @@ mt7530_mii_read(struct mt7530_priv *priv
  69  static void
  70  mt7530_write(struct mt7530_priv *priv, u32 reg, u32 val)
  71  {
  72 -       struct mii_bus *bus = priv->bus;
  73 -
  74 -       mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
  75 +       mt7530_mutex_lock(priv);
  76
  77         mt7530_mii_write(priv, reg, val);
  78
  79 -       mutex_unlock(&bus->mdio_lock);
  80 +       mt7530_mutex_unlock(priv);
  81  }
  82
  83  static u32
  84 @@ -282,14 +289,13 @@ _mt7530_unlocked_read(struct mt7530_dumm
  85  static u32
  86  _mt7530_read(struct mt7530_dummy_poll *p)
  87  {
  88 -       struct mii_bus          *bus = p->priv->bus;
  89         u32 val;
  90
  91 -       mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
  92 +       mt7530_mutex_lock(p->priv);
  93
  94         val = mt7530_mii_read(p->priv, p->reg);
  95
  96 -       mutex_unlock(&bus->mdio_lock);
  97 +       mt7530_mutex_unlock(p->priv);
  98
  99         return val;
 100  }
 101 @@ -307,13 +313,11 @@ static void
 102  mt7530_rmw(struct mt7530_priv *priv, u32 reg,
 103            u32 mask, u32 set)
 104  {
 105 -       struct mii_bus *bus = priv->bus;
 106 -
 107 -       mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
 108 +       mt7530_mutex_lock(priv);
 109
 110         regmap_update_bits(priv->regmap, reg, mask, set);
 111
 112 -       mutex_unlock(&bus->mdio_lock);
 113 +       mt7530_mutex_unlock(priv);
 114  }
 115
 116  static void
 117 @@ -645,14 +649,13 @@ static int
 118  mt7531_ind_c45_phy_read(struct mt7530_priv *priv, int port, int devad,
 119                         int regnum)
 120  {
 121 -       struct mii_bus *bus = priv->bus;
 122         struct mt7530_dummy_poll p;
 123         u32 reg, val;
 124         int ret;
 125
 126         INIT_MT7530_DUMMY_POLL(&p, priv, MT7531_PHY_IAC);
 127
 128 -       mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
 129 +       mt7530_mutex_lock(priv);
 130
 131         ret = readx_poll_timeout(_mt7530_unlocked_read, &p, val,
 132                                  !(val & MT7531_PHY_ACS_ST), 20, 100000);
 133 @@ -685,7 +688,7 @@ mt7531_ind_c45_phy_read(struct mt7530_pr
 134
 135         ret = val & MT7531_MDIO_RW_DATA_MASK;
 136  out:
 137 -       mutex_unlock(&bus->mdio_lock);
 138 +       mt7530_mutex_unlock(priv);
 139
 140         return ret;
 141  }
 142 @@ -694,14 +697,13 @@ static int
 143  mt7531_ind_c45_phy_write(struct mt7530_priv *priv, int port, int devad,
 144                          int regnum, u32 data)
 145  {
 146 -       struct mii_bus *bus = priv->bus;
 147         struct mt7530_dummy_poll p;
 148         u32 val, reg;
 149         int ret;
 150
 151         INIT_MT7530_DUMMY_POLL(&p, priv, MT7531_PHY_IAC);
 152
 153 -       mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
 154 +       mt7530_mutex_lock(priv);
 155
 156         ret = readx_poll_timeout(_mt7530_unlocked_read, &p, val,
 157                                  !(val & MT7531_PHY_ACS_ST), 20, 100000);
 158 @@ -733,7 +735,7 @@ mt7531_ind_c45_phy_write(struct mt7530_p
 159         }
 160
 161  out:
 162 -       mutex_unlock(&bus->mdio_lock);
 163 +       mt7530_mutex_unlock(priv);
 164
 165         return ret;
 166  }
 167 @@ -741,14 +743,13 @@ out:
 168  static int
 169  mt7531_ind_c22_phy_read(struct mt7530_priv *priv, int port, int regnum)
 170  {
 171 -       struct mii_bus *bus = priv->bus;
 172         struct mt7530_dummy_poll p;
 173         int ret;
 174         u32 val;
 175
 176         INIT_MT7530_DUMMY_POLL(&p, priv, MT7531_PHY_IAC);
 177
 178 -       mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
 179 +       mt7530_mutex_lock(priv);
 180
 181         ret = readx_poll_timeout(_mt7530_unlocked_read, &p, val,
 182                                  !(val & MT7531_PHY_ACS_ST), 20, 100000);
 183 @@ -771,7 +772,7 @@ mt7531_ind_c22_phy_read(struct mt7530_pr
 184
 185         ret = val & MT7531_MDIO_RW_DATA_MASK;
 186  out:
 187 -       mutex_unlock(&bus->mdio_lock);
 188 +       mt7530_mutex_unlock(priv);
 189
 190         return ret;
 191  }
 192 @@ -780,14 +781,13 @@ static int
 193  mt7531_ind_c22_phy_write(struct mt7530_priv *priv, int port, int regnum,
 194                          u16 data)
 195  {
 196 -       struct mii_bus *bus = priv->bus;
 197         struct mt7530_dummy_poll p;
 198         int ret;
 199         u32 reg;
 200
 201         INIT_MT7530_DUMMY_POLL(&p, priv, MT7531_PHY_IAC);
 202
 203 -       mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
 204 +       mt7530_mutex_lock(priv);
 205
 206         ret = readx_poll_timeout(_mt7530_unlocked_read, &p, reg,
 207                                  !(reg & MT7531_PHY_ACS_ST), 20, 100000);
 208 @@ -809,7 +809,7 @@ mt7531_ind_c22_phy_write(struct mt7530_p
 209         }
 210
 211  out:
 212 -       mutex_unlock(&bus->mdio_lock);
 213 +       mt7530_mutex_unlock(priv);
 214
 215         return ret;
 216  }
 217 @@ -1109,7 +1109,6 @@ static int
 218  mt7530_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu)
 219  {
 220         struct mt7530_priv *priv = ds->priv;
 221 -       struct mii_bus *bus = priv->bus;
 222         int length;
 223         u32 val;
 224
 225 @@ -1120,7 +1119,7 @@ mt7530_port_change_mtu(struct dsa_switch
 226         if (!dsa_is_cpu_port(ds, port))
 227                 return 0;
 228
 229 -       mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
 230 +       mt7530_mutex_lock(priv);
 231
 232         val = mt7530_mii_read(priv, MT7530_GMACCR);
 233         val &= ~MAX_RX_PKT_LEN_MASK;
 234 @@ -1141,7 +1140,7 @@ mt7530_port_change_mtu(struct dsa_switch
 235
 236         mt7530_mii_write(priv, MT7530_GMACCR, val);
 237
 238 -       mutex_unlock(&bus->mdio_lock);
 239 +       mt7530_mutex_unlock(priv);
 240
 241         return 0;
 242  }
 243 @@ -1942,10 +1941,10 @@ mt7530_irq_thread_fn(int irq, void *dev_
 244         u32 val;
 245         int p;
 246
 247 -       mutex_lock_nested(&priv->bus->mdio_lock, MDIO_MUTEX_NESTED);
 248 +       mt7530_mutex_lock(priv);
 249         val = mt7530_mii_read(priv, MT7530_SYS_INT_STS);
 250         mt7530_mii_write(priv, MT7530_SYS_INT_STS, val);
 251 -       mutex_unlock(&priv->bus->mdio_lock);
 252 +       mt7530_mutex_unlock(priv);
 253
 254         for (p = 0; p < MT7530_NUM_PHYS; p++) {
 255                 if (BIT(p) & val) {
 256 @@ -1981,7 +1980,7 @@ mt7530_irq_bus_lock(struct irq_data *d)
 257  {
 258         struct mt7530_priv *priv = irq_data_get_irq_chip_data(d);
 259
 260 -       mutex_lock_nested(&priv->bus->mdio_lock, MDIO_MUTEX_NESTED);
 261 +       mt7530_mutex_lock(priv);
 262  }
 263
 264  static void
 265 @@ -1990,7 +1989,7 @@ mt7530_irq_bus_sync_unlock(struct irq_da
 266         struct mt7530_priv *priv = irq_data_get_irq_chip_data(d);
 267
 268         mt7530_mii_write(priv, MT7530_SYS_INT_EN, priv->irq_enable);
 269 -       mutex_unlock(&priv->bus->mdio_lock);
 270 +       mt7530_mutex_unlock(priv);
 271  }
 272
 273  static struct irq_chip mt7530_irq_chip = {