hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ar8216: fix ATU flushing 

The functionality to flush the address translation table contains two bugs
which luckily compensate each other.
1. Just setting the operation is not sufficient to perform the flushing.
   The "active" bit needs to be set to actually trigger an action.
   For the vtu operations this is implemented correctly.
2. ar8xxx_phy_read_status is called every 2s by the phy state machine
   to check for link changes. This would have caused an ATU flush
   every 2s.

Fix the chip-specific ATU flush functions and remove the ATU flush call
from ar8xxx_phy_read_status.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>

SVN-Revision: 44101
owl
Felix Fietkau 2015-01-24 19:41:51 +00:00
parent 768d09be87
commit 74146c62c0
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
target/linux/generic/files/drivers/net/phy/ar8216.c
View File

@ -613,7 +613,8 @@ ar8216_atu_flush(struct ar8xxx_priv *priv)
ret = ar8216_wait_bit(priv, AR8216_REG_ATU, AR8216_ATU_ACTIVE, 0); ret = ar8216_wait_bit(priv, AR8216_REG_ATU, AR8216_ATU_ACTIVE, 0);
if (!ret) if (!ret)
ar8xxx_write(priv, AR8216_REG_ATU, AR8216_ATU_OP_FLUSH); ar8xxx_write(priv, AR8216_REG_ATU, AR8216_ATU_OP_FLUSH |
AR8216_ATU_ACTIVE);
return ret; return ret;
} }
@ -1711,7 +1712,6 @@ ar8xxx_phy_read_status(struct phy_device *phydev)
{ {
struct ar8xxx_priv *priv = phydev->priv; struct ar8xxx_priv *priv = phydev->priv;
struct switch_port_link link; struct switch_port_link link;
int ret;
if (phydev->addr != 0) if (phydev->addr != 0)
return genphy_read_status(phydev); return genphy_read_status(phydev);
@ -1736,16 +1736,11 @@ ar8xxx_phy_read_status(struct phy_device *phydev)
} }
phydev->duplex = link.duplex ? DUPLEX_FULL : DUPLEX_HALF; phydev->duplex = link.duplex ? DUPLEX_FULL : DUPLEX_HALF;
/* flush the address translation unit */
mutex_lock(&priv->reg_mutex);
ret = priv->chip->atu_flush(priv);
mutex_unlock(&priv->reg_mutex);
phydev->state = PHY_RUNNING; phydev->state = PHY_RUNNING;
netif_carrier_on(phydev->attached_dev); netif_carrier_on(phydev->attached_dev);
phydev->adjust_link(phydev->attached_dev); phydev->adjust_link(phydev->attached_dev);
return ret; return 0;
} }
static int static int

3
target/linux/generic/files/drivers/net/phy/ar8327.c
View File

@ -759,7 +759,8 @@ ar8327_atu_flush(struct ar8xxx_priv *priv)
AR8327_ATU_FUNC_BUSY, 0); AR8327_ATU_FUNC_BUSY, 0);
if (!ret) if (!ret)
ar8xxx_write(priv, AR8327_REG_ATU_FUNC, ar8xxx_write(priv, AR8327_REG_ATU_FUNC,
AR8327_ATU_FUNC_OP_FLUSH); AR8327_ATU_FUNC_OP_FLUSH |
AR8327_ATU_FUNC_BUSY);
return ret; return ret;
} }