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
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.
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>
15 drivers/net/dsa/mt7530.c | 73 ++++++++++++++++++++--------------------
16 1 file changed, 36 insertions(+), 37 deletions(-)
18 --- a/drivers/net/dsa/mt7530.c
19 +++ b/drivers/net/dsa/mt7530.c
20 @@ -143,31 +143,40 @@ err:
24 -core_write(struct mt7530_priv *priv, u32 reg, u32 val)
25 +mt7530_mutex_lock(struct mt7530_priv *priv)
27 - struct mii_bus *bus = priv->bus;
28 + mutex_lock_nested(&priv->bus->mdio_lock, MDIO_MUTEX_NESTED);
31 - mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
33 +mt7530_mutex_unlock(struct mt7530_priv *priv)
35 + mutex_unlock(&priv->bus->mdio_lock);
39 +core_write(struct mt7530_priv *priv, u32 reg, u32 val)
41 + mt7530_mutex_lock(priv);
43 core_write_mmd_indirect(priv, reg, MDIO_MMD_VEND2, val);
45 - mutex_unlock(&bus->mdio_lock);
46 + mt7530_mutex_unlock(priv);
50 core_rmw(struct mt7530_priv *priv, u32 reg, u32 mask, u32 set)
52 - struct mii_bus *bus = priv->bus;
55 - mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
56 + mt7530_mutex_lock(priv);
58 val = core_read_mmd_indirect(priv, reg, MDIO_MMD_VEND2);
61 core_write_mmd_indirect(priv, reg, MDIO_MMD_VEND2, val);
63 - mutex_unlock(&bus->mdio_lock);
64 + mt7530_mutex_unlock(priv);
68 @@ -264,13 +273,11 @@ mt7530_mii_read(struct mt7530_priv *priv
70 mt7530_write(struct mt7530_priv *priv, u32 reg, u32 val)
72 - struct mii_bus *bus = priv->bus;
74 - mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
75 + mt7530_mutex_lock(priv);
77 mt7530_mii_write(priv, reg, val);
79 - mutex_unlock(&bus->mdio_lock);
80 + mt7530_mutex_unlock(priv);
84 @@ -282,14 +289,13 @@ _mt7530_unlocked_read(struct mt7530_dumm
86 _mt7530_read(struct mt7530_dummy_poll *p)
88 - struct mii_bus *bus = p->priv->bus;
91 - mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
92 + mt7530_mutex_lock(p->priv);
94 val = mt7530_mii_read(p->priv, p->reg);
96 - mutex_unlock(&bus->mdio_lock);
97 + mt7530_mutex_unlock(p->priv);
101 @@ -307,13 +313,11 @@ static void
102 mt7530_rmw(struct mt7530_priv *priv, u32 reg,
105 - struct mii_bus *bus = priv->bus;
107 - mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
108 + mt7530_mutex_lock(priv);
110 regmap_update_bits(priv->regmap, reg, mask, set);
112 - mutex_unlock(&bus->mdio_lock);
113 + mt7530_mutex_unlock(priv);
117 @@ -645,14 +649,13 @@ static int
118 mt7531_ind_c45_phy_read(struct mt7530_priv *priv, int port, int devad,
121 - struct mii_bus *bus = priv->bus;
122 struct mt7530_dummy_poll p;
126 INIT_MT7530_DUMMY_POLL(&p, priv, MT7531_PHY_IAC);
128 - mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
129 + mt7530_mutex_lock(priv);
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
135 ret = val & MT7531_MDIO_RW_DATA_MASK;
137 - mutex_unlock(&bus->mdio_lock);
138 + mt7530_mutex_unlock(priv);
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)
146 - struct mii_bus *bus = priv->bus;
147 struct mt7530_dummy_poll p;
151 INIT_MT7530_DUMMY_POLL(&p, priv, MT7531_PHY_IAC);
153 - mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
154 + mt7530_mutex_lock(priv);
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
162 - mutex_unlock(&bus->mdio_lock);
163 + mt7530_mutex_unlock(priv);
167 @@ -741,14 +743,13 @@ out:
169 mt7531_ind_c22_phy_read(struct mt7530_priv *priv, int port, int regnum)
171 - struct mii_bus *bus = priv->bus;
172 struct mt7530_dummy_poll p;
176 INIT_MT7530_DUMMY_POLL(&p, priv, MT7531_PHY_IAC);
178 - mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
179 + mt7530_mutex_lock(priv);
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
185 ret = val & MT7531_MDIO_RW_DATA_MASK;
187 - mutex_unlock(&bus->mdio_lock);
188 + mt7530_mutex_unlock(priv);
192 @@ -780,14 +781,13 @@ static int
193 mt7531_ind_c22_phy_write(struct mt7530_priv *priv, int port, int regnum,
196 - struct mii_bus *bus = priv->bus;
197 struct mt7530_dummy_poll p;
201 INIT_MT7530_DUMMY_POLL(&p, priv, MT7531_PHY_IAC);
203 - mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
204 + mt7530_mutex_lock(priv);
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
212 - mutex_unlock(&bus->mdio_lock);
213 + mt7530_mutex_unlock(priv);
217 @@ -1125,7 +1125,6 @@ static int
218 mt7530_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu)
220 struct mt7530_priv *priv = ds->priv;
221 - struct mii_bus *bus = priv->bus;
225 @@ -1136,7 +1135,7 @@ mt7530_port_change_mtu(struct dsa_switch
226 if (!dsa_is_cpu_port(ds, port))
229 - mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
230 + mt7530_mutex_lock(priv);
232 val = mt7530_mii_read(priv, MT7530_GMACCR);
233 val &= ~MAX_RX_PKT_LEN_MASK;
234 @@ -1157,7 +1156,7 @@ mt7530_port_change_mtu(struct dsa_switch
236 mt7530_mii_write(priv, MT7530_GMACCR, val);
238 - mutex_unlock(&bus->mdio_lock);
239 + mt7530_mutex_unlock(priv);
243 @@ -1958,10 +1957,10 @@ mt7530_irq_thread_fn(int irq, void *dev_
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);
254 for (p = 0; p < MT7530_NUM_PHYS; p++) {
256 @@ -1997,7 +1996,7 @@ mt7530_irq_bus_lock(struct irq_data *d)
258 struct mt7530_priv *priv = irq_data_get_irq_chip_data(d);
260 - mutex_lock_nested(&priv->bus->mdio_lock, MDIO_MUTEX_NESTED);
261 + mt7530_mutex_lock(priv);
265 @@ -2006,7 +2005,7 @@ mt7530_irq_bus_sync_unlock(struct irq_da
266 struct mt7530_priv *priv = irq_data_get_irq_chip_data(d);
268 mt7530_mii_write(priv, MT7530_SYS_INT_EN, priv->irq_enable);
269 - mutex_unlock(&priv->bus->mdio_lock);
270 + mt7530_mutex_unlock(priv);
273 static struct irq_chip mt7530_irq_chip = {