Re: [PATCH net-next v4 1/5] net: stmmac: dwmac-sun8i: Put the EPHY clock and reset after the MAC
From: Maxime Chevallier
Date: Sun Nov 22 2026 - 11:47:28 EST
Hi,
On 11/20/26 11:45, Arun Iyengar via B4 Relay wrote:
> From: Arun Iyengar <aiyengar1990@xxxxxxxxx>
>
> sun8i_dwmac_exit() unpowers the internal PHY through ephy_clk and
> rst_ephy, but the probe error path and sun8i_dwmac_remove() put both
> before stmmac_pltfr_remove() calls it. If mdio_mux_init() fails after
> the scan of the internal bus has powered the PHY, this is a
> use-after-free.
>
> Put them after stmmac_pltfr_remove(). The explicit unpower in remove()
> is then redundant.
>
> Suggested-by: Chen-Yu Tsai <wens@xxxxxxxxxx>
> Signed-off-by: Arun Iyengar <aiyengar1990@xxxxxxxxx>
Reviewed-by: Maxime Chevallier <maxime.chevallier@xxxxxxxxxxx>
Maxime
> ---
> drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 15 ++++++---------
> 1 file changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
> index 2ece7ba9dd73..9fb398f7cf9e 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
> @@ -1236,7 +1236,7 @@ static int sun8i_dwmac_probe(struct platform_device *pdev)
> ret = sun8i_dwmac_register_mdio_mux(priv);
> if (ret) {
> dev_err(&pdev->dev, "Failed to register mux\n");
> - goto dwmac_mux;
> + goto dwmac_remove;
> }
> }
>
> @@ -1244,12 +1244,11 @@ static int sun8i_dwmac_probe(struct platform_device *pdev)
>
> return 0;
>
> -dwmac_mux:
> - reset_control_put(gmac->rst_ephy);
> - clk_put(gmac->ephy_clk);
> dwmac_remove:
> pm_runtime_put_noidle(&pdev->dev);
> stmmac_pltfr_remove(pdev);
> + reset_control_put(gmac->rst_ephy);
> + clk_put(gmac->ephy_clk);
> dwmac_syscon:
> sun8i_dwmac_unset_syscon(gmac);
>
> @@ -1262,14 +1261,12 @@ static void sun8i_dwmac_remove(struct platform_device *pdev)
> struct stmmac_priv *priv = netdev_priv(ndev);
> struct sunxi_priv_data *gmac = priv->plat->bsp_priv;
>
> - if (gmac->variant->soc_has_internal_phy) {
> + if (gmac->variant->soc_has_internal_phy)
> mdio_mux_uninit(gmac->mux_handle);
> - sun8i_dwmac_unpower_internal_phy(gmac);
> - reset_control_put(gmac->rst_ephy);
> - clk_put(gmac->ephy_clk);
> - }
>
> stmmac_pltfr_remove(pdev);
> + reset_control_put(gmac->rst_ephy);
> + clk_put(gmac->ephy_clk);
> sun8i_dwmac_unset_syscon(gmac);
> }
>
>