From: Florian Fainelli <f.fainelli@gmail.com>
To: netdev@vger.kernel.org
Cc: Florian Fainelli <f.fainelli@gmail.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@kernel.org>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Heiner Kallweit <hkallweit1@gmail.com>,
Russell King <linux@armlinux.org.uk>,
Jijie Shao <shaojijie@huawei.com>,
Simon Horman <horms@kernel.org>,
Runyu Xiao <runyu.xiao@seu.edu.cn>,
David Yang <mmyangfl@gmail.com>,
Herbert Valerio Riedel <hvr@gnu.org>,
Danny Kukawka <danny.kukawka@bisect.de>,
Mugunthan V N <mugunthanvnm@ti.com>,
Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>,
linux-kernel@vger.kernel.org (open list),
Manuel Lauss <manuel.lauss@gmail.com>
Subject: [PATCH net v4 03/10] net: au1000: disconnect the PHY before freeing the MDIO bus
Date: Fri, 20 Nov 2026 16:48:02 -0800 [thread overview]
Message-ID: <20261121004809.1690280-4-f.fainelli@gmail.com> (raw)
In-Reply-To: <20261121004809.1690280-1-f.fainelli@gmail.com>
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 <f.fainelli@gmail.com>
---
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
next prev parent reply other threads:[~2026-11-21 0:48 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-21 0:47 [PATCH net v4 00/10] net: au1000: Bug fixes Florian Fainelli
2026-11-21 0:48 ` [PATCH net v4 01/10] net: au1000: recycle RX descriptors on allocation failure Florian Fainelli
2026-11-21 0:48 ` [PATCH net v4 02/10] net: au1000: clear all-multicast mode when restoring hash filtering Florian Fainelli
2026-11-21 0:48 ` Florian Fainelli [this message]
2026-11-21 0:48 ` [PATCH net v4 04/10] net: au1000: report MDIO transaction timeouts Florian Fainelli
2026-11-21 0:48 ` [PATCH net v4 05/10] net: au1000: serialize TX completion with packet submission Florian Fainelli
2026-11-21 0:48 ` [PATCH net v4 06/10] net: au1000: restore receive filtering before enabling RX Florian Fainelli
2026-11-21 0:48 ` [PATCH net v4 07/10] net: au1000: restore RX buffer addresses when restarting the MAC Florian Fainelli
2026-11-21 0:48 ` [PATCH net v4 08/10] net: phy: smsc: wait for LAN83C183 power-down recovery Florian Fainelli
2026-11-21 0:48 ` [PATCH net v4 09/10] net: au1000: keep the MAC stopped until the PHY link is ready Florian Fainelli
2026-11-21 0:48 ` [PATCH net v4 10/10] net: au1000: reject frames larger than the TX bounce buffer Florian Fainelli
2026-11-21 0:53 ` [PATCH net v4 00/10] net: au1000: Bug fixes netdev-bot+sinfo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261121004809.1690280-4-f.fainelli@gmail.com \
--to=f.fainelli@gmail.com \
--cc=andrew+netdev@lunn.ch \
--cc=danny.kukawka@bisect.de \
--cc=davem@davemloft.net \
--cc=edumazet@kernel.org \
--cc=hkallweit1@gmail.com \
--cc=horms@kernel.org \
--cc=hvr@gnu.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=manuel.lauss@gmail.com \
--cc=mmyangfl@gmail.com \
--cc=mugunthanvnm@ti.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=runyu.xiao@seu.edu.cn \
--cc=sebastian.hesselbarth@gmail.com \
--cc=shaojijie@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).