Commit 7f864458 authored by Sebastian Reichel's avatar Sebastian Reichel Committed by Jakub Kicinski
Browse files

net: stmmac: dwmac-rk: Fix disabling set_clock_selection 



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: 2f2b60a0 ("net: ethernet: stmmac: dwmac-rk: Add gmac support for rk3588")
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20251014-rockchip-network-clock-fix-v1-1-c257b4afdf75@collabora.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent bf29555f

drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c

+5 −4
Original line number Diff line number Diff line
@@ -1446,14 +1446,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;

		}

	}