Balance phy_connect() on probe failure and removal. Otherwise device and module references taken during PHY attachment leak, and the PHY retains an attached_dev pointer to the freed netdev. The attachment path uses PHY polling, so there is no PHY interrupt to release. Disconnect before unregistering the bus while its MDIO callbacks and MAC registers remain usable. PHY teardown can re-enable the MAC for MDIO even if the interface was never opened. Reset the MAC after PHY and MDIO bus teardown, before releasing descriptors and register mappings. Skip MAC control accesses when mac_enabled is clear, since stopping an already clock-gated MAC hangs MTX-1. This guard also covers the existing probe failure path: au1000_probe() resets and gates the MAC before register_netdev(), and registration failure reaches another reset in err_out. If no intervening MDIO access has re-enabled the MAC, that second reset must not touch its control register. Always clear the DMA descriptor control bits and TX state. Fixes: 0638dec01e89 ("[PATCH] net: au1000_eth: PHY framework conversion") Signed-off-by: Florian Fainelli --- drivers/net/ethernet/amd/au1000_eth.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/amd/au1000_eth.c b/drivers/net/ethernet/amd/au1000_eth.c index 58bc8e1b539d..7063f9e5bc7c 100644 --- a/drivers/net/ethernet/amd/au1000_eth.c +++ b/drivers/net/ethernet/amd/au1000_eth.c @@ -584,14 +584,17 @@ static void au1000_reset_mac_unlocked(struct net_device *dev) struct au1000_private *const aup = netdev_priv(dev); int i; - au1000_hard_stop(dev); + if (aup->mac_enabled) { + au1000_hard_stop(dev); - writel(MAC_EN_CLOCK_ENABLE, aup->enable); - wmb(); /* drain writebuffer */ - mdelay(2); - writel(0, aup->enable); - wmb(); /* drain writebuffer */ - mdelay(2); + writel(MAC_EN_CLOCK_ENABLE, aup->enable); + wmb(); /* drain writebuffer */ + mdelay(2); + writel(0, aup->enable); + wmb(); /* drain writebuffer */ + mdelay(2); + aup->mac_enabled = 0; + } aup->tx_full = 0; for (i = 0; i < NUM_RX_DMA; i++) { @@ -603,8 +606,6 @@ static void au1000_reset_mac_unlocked(struct net_device *dev) aup->tx_dma_ring[i]->buff_stat &= ~0xf; } - aup->mac_enabled = 0; - } static void au1000_reset_mac(struct net_device *dev) @@ -1287,6 +1288,8 @@ static int au1000_probe(struct platform_device *pdev) return 0; err_out: + if (dev->phydev) + phy_disconnect(dev->phydev); if (aup->mii_bus) mdiobus_unregister(aup->mii_bus); @@ -1334,9 +1337,14 @@ static void au1000_remove(struct platform_device *pdev) struct resource *base, *macen; unregister_netdev(dev); + if (dev->phydev) + phy_disconnect(dev->phydev); mdiobus_unregister(aup->mii_bus); mdiobus_free(aup->mii_bus); + /* PHY teardown may have re-enabled the MAC for MDIO accesses. */ + au1000_reset_mac(dev); + for (i = 0; i < NUM_RX_DMA; i++) if (aup->rx_db_inuse[i]) au1000_ReleaseDB(aup, aup->rx_db_inuse[i]); -- 2.53.0