Skip to content

Commit

Permalink
net: dsa: mt7530: skip locking if MDIO bus isn't present
Browse files Browse the repository at this point in the history
As MT7530 and MT7531 internally use 32-bit wide registers, each access
to any register of the switch requires several operations on the MDIO
bus. Hence if there is congruent access, e.g. due to PCS or PHY
polling, this can mess up and interfere with another ongoing register
access sequence.

However, the MDIO bus mutex is only relevant for MDIO-connected
switches. Prepare switches which have there registers directly mapped
into the SoCs register space via MMIO which do not require such
locking. There we can simply use regmap's default locking mechanism.

Hence guard mutex operations to only be performed in case of MDIO
connected switches.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Daniel Golle authored and David S. Miller committed Apr 3, 2023
1 parent cb675af commit 54d4147
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/net/dsa/mt7530.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,15 @@ core_write_mmd_indirect(struct mt7530_priv *priv, int prtad,
static void
mt7530_mutex_lock(struct mt7530_priv *priv)
{
mutex_lock_nested(&priv->bus->mdio_lock, MDIO_MUTEX_NESTED);
if (priv->bus)
mutex_lock_nested(&priv->bus->mdio_lock, MDIO_MUTEX_NESTED);
}

static void
mt7530_mutex_unlock(struct mt7530_priv *priv)
{
mutex_unlock(&priv->bus->mdio_lock);
if (priv->bus)
mutex_unlock(&priv->bus->mdio_lock);
}

static void
Expand Down

0 comments on commit 54d4147

Please sign in to comment.