path: root/drivers
diff options
authorFlorian Fainelli <>2016-11-13 17:50:35 -0800
committerGreg Kroah-Hartman <>2016-11-21 10:11:36 +0100
commit4ea98e573d65b79714d99a4707b771d3a8ec98ae (patch)
tree6bc2c9877583b05bf860abe786d9be2a42c1d959 /drivers
parent150b491b1b88d467ee6e2982b7baa074e53b60a0 (diff)
net: stmmac: Fix lack of link transition for fixed PHYs
[ Upstream commit c51e424dc79e1428afc4d697cdb6a07f7af70cbf ] Commit 52f95bbfcf72 ("stmmac: fix adjust link call in case of a switch is attached") added some logic to avoid polling the fixed PHY and therefore invoking the adjust_link callback more than once, since this is a fixed PHY and link events won't be generated. This works fine the first time, because we start with phydev->irq = PHY_POLL, so we call adjust_link, then we set phydev->irq = PHY_IGNORE_INTERRUPT and we stop polling the PHY. Now, if we called ndo_close(), which calls both phy_stop() and does an explicit netif_carrier_off(), we end up with a link down. Upon calling ndo_open() again, despite starting the PHY state machine, we have PHY_IGNORE_INTERRUPT set, and we generate no link event at all, so the link is permanently down. Fixes: 52f95bbfcf72 ("stmmac: fix adjust link call in case of a switch is attached") Signed-off-by: Florian Fainelli <> Acked-by: Giuseppe Cavallaro <> Signed-off-by: David S. Miller <> Signed-off-by: Greg Kroah-Hartman <>
Diffstat (limited to 'drivers')
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 4c8c60af7985..fe9e7b1979b8 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -871,6 +871,13 @@ static int stmmac_init_phy(struct net_device *dev)
return -ENODEV;
+ /* stmmac_adjust_link will change this to PHY_IGNORE_INTERRUPT to avoid
+ * subsequent PHY polling, make sure we force a link transition if
+ * we have a UP/DOWN/UP transition
+ */
+ if (phydev->is_pseudo_fixed_link)
+ phydev->irq = PHY_POLL;
pr_debug("stmmac_init_phy: %s: attached to PHY (UID 0x%x)"
" Link = %d\n", dev->name, phydev->phy_id, phydev->link);