net: stmmac: dwmac-rk: Fix disabling set_clock_selection

commit 7f864458e9a6d2000b726d14b3d3a706ac92a3b0 upstream.

On all platforms set_clock_selection() writes to a GRF register. This
requires certain clocks running and thus should happen before the
clocks are disabled.

This has been noticed on RK3576 Sige5, which hangs during system suspend
when trying to suspend the second network interface. Note, that
suspending the first interface works, because the second device ensures
that the necessary clocks for the GRF are enabled.

Cc: stable@vger.kernel.org
Fixes: 2f2b60a0ec28 ("net: ethernet: stmmac: dwmac-rk: Add gmac support for rk3588")
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20251014-rockchip-network-clock-fix-v1-1-c257b4afdf75@collabora.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
index 8f90eae937741199476aa685ebf884ab88a7e7d9..d152afa48d5c2dd772ff4f16edcd56472381fbe8 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
@@ -1721,14 +1721,15 @@ static int gmac_clk_enable(struct rk_priv_data *bsp_priv, bool enable)
                }
        } else {
                if (bsp_priv->clk_enabled) {
+                       if (bsp_priv->ops && bsp_priv->ops->set_clock_selection) {
+                               bsp_priv->ops->set_clock_selection(bsp_priv,
+                                             bsp_priv->clock_input, false);
+                       }
+
                        clk_bulk_disable_unprepare(bsp_priv->num_clks,
                                                   bsp_priv->clks);
                        clk_disable_unprepare(bsp_priv->clk_phy);
 
-                       if (bsp_priv->ops && bsp_priv->ops->set_clock_selection)
-                               bsp_priv->ops->set_clock_selection(bsp_priv,
-                                             bsp_priv->clock_input, false);
-
                        bsp_priv->clk_enabled = false;
                }
        }