fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ramips: mt7530 swconfig: fix race condition in register access"

Browse Source 
This reverts commit a5b9ff72cf. Fix: #359
This commit is contained in:
AmadeusGhost 2021-04-14 11:23:05 +08:00
parent 12509785d2
commit fad6849f47
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mt7530.c
View File

@ -323,11 +323,9 @@ mt7530_r32(struct mt7530_priv *priv, u32 reg)
if (priv->bus) {
u16 high, low;
mutex_lock(&priv->bus->mdio_lock);
__mdiobus_write(priv->bus, 0x1f, 0x1f, (reg >> 6) & 0x3ff);
low = __mdiobus_read(priv->bus, 0x1f, (reg >> 2) & 0xf);
high = __mdiobus_read(priv->bus, 0x1f, 0x10);
mutex_unlock(&priv->bus->mdio_lock);
mdiobus_write(priv->bus, 0x1f, 0x1f, (reg >> 6) & 0x3ff);
low = mdiobus_read(priv->bus, 0x1f, (reg >> 2) & 0xf);
high = mdiobus_read(priv->bus, 0x1f, 0x10);
return (high << 16) | (low & 0xffff);
}
@ -342,11 +340,9 @@ static void
mt7530_w32(struct mt7530_priv *priv, u32 reg, u32 val)
{
if (priv->bus) {
mutex_lock(&priv->bus->mdio_lock);
__mdiobus_write(priv->bus, 0x1f, 0x1f, (reg >> 6) & 0x3ff);
__mdiobus_write(priv->bus, 0x1f, (reg >> 2) & 0xf, val & 0xffff);
__mdiobus_write(priv->bus, 0x1f, 0x10, val >> 16);
mutex_unlock(&priv->bus->mdio_lock);
mdiobus_write(priv->bus, 0x1f, 0x1f, (reg >> 6) & 0x3ff);
mdiobus_write(priv->bus, 0x1f, (reg >> 2) & 0xf, val & 0xffff);
mdiobus_write(priv->bus, 0x1f, 0x10, val >> 16);
return;
}