net: systemport: update UMAC_CMD only when link is detected
When we bring the interface down, phy_stop() will schedule the PHY state machine to call our link adjustment callback. By the time we do so, we may have clock gated off the SYSTEMPORT hardware block, and this will cause bus errors to happen in bcm_sysport_adj_link(): Make sure that we only touch the UMAC_CMD register when there is an actual link. This is safe to do for two reasons: - updating the Ethernet MAC registers only make sense when a physical link is present - the PHY library state machine first set phydev->link = 0 before invoking phydev->adjust_link in the PHY_HALTED case This is a similar fix to the GENET one:c677ba8b3c
("net: bcmgenet: update UMAC_CMD only when link is detected"). Fixes:80105befdb
("net: systemport: add Broadcom SYSTEMPORT Ethernet MAC driver") Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
a9fe8e2994
commit
4a804c0163
|
@ -1071,16 +1071,19 @@ static void bcm_sysport_adj_link(struct net_device *dev)
|
|||
if (!phydev->pause)
|
||||
cmd_bits |= CMD_RX_PAUSE_IGNORE | CMD_TX_PAUSE_IGNORE;
|
||||
|
||||
if (changed) {
|
||||
if (!changed)
|
||||
return;
|
||||
|
||||
if (phydev->link) {
|
||||
reg = umac_readl(priv, UMAC_CMD);
|
||||
reg &= ~((CMD_SPEED_MASK << CMD_SPEED_SHIFT) |
|
||||
CMD_HD_EN | CMD_RX_PAUSE_IGNORE |
|
||||
CMD_TX_PAUSE_IGNORE);
|
||||
reg |= cmd_bits;
|
||||
umac_writel(priv, reg, UMAC_CMD);
|
||||
|
||||
phy_print_status(priv->phydev);
|
||||
}
|
||||
|
||||
phy_print_status(priv->phydev);
|
||||
}
|
||||
|
||||
static int bcm_sysport_init_tx_ring(struct bcm_sysport_priv *priv,
|
||||
|
|
Loading…
Reference in New Issue