This is a note to let you know that I've just added the patch titled net: stmmac: dwmac-rk: Fix ethernet on rk3399 based devices to the 5.10-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: net-stmmac-dwmac-rk-fix-ethernet-on-rk3399-based-devices.patch and it can be found in the queue-5.10 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From aec3f415f7244b7747a7952596971adb0df2f568 Mon Sep 17 00:00:00 2001 From: Punit Agrawal <punitagrawal@xxxxxxxxx> Date: Wed, 29 Sep 2021 22:50:49 +0900 Subject: net: stmmac: dwmac-rk: Fix ethernet on rk3399 based devices From: Punit Agrawal <punitagrawal@xxxxxxxxx> commit aec3f415f7244b7747a7952596971adb0df2f568 upstream. Commit 2d26f6e39afb ("net: stmmac: dwmac-rk: fix unbalanced pm_runtime_enable warnings") while getting rid of a runtime PM warning ended up breaking ethernet on rk3399 based devices. By dropping an extra reference to the device, the commit ends up enabling suspend / resume of the ethernet device - which appears to be broken. While the issue with runtime pm is being investigated, partially revert commit 2d26f6e39afb to restore the network on rk3399. Fixes: 2d26f6e39afb ("net: stmmac: dwmac-rk: fix unbalanced pm_runtime_enable warnings") Suggested-by: Heiko Stuebner <heiko@xxxxxxxxx> Signed-off-by: Punit Agrawal <punitagrawal@xxxxxxxxx> Cc: Michael Riesch <michael.riesch@xxxxxxxxxxxxxx> Tested-by: Heiko Stuebner <heiko@xxxxxxxxx> Link: https://lore.kernel.org/r/20210929135049.3426058-1-punitagrawal@xxxxxxxxx Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -21,6 +21,7 @@ #include <linux/delay.h> #include <linux/mfd/syscon.h> #include <linux/regmap.h> +#include <linux/pm_runtime.h> #include "stmmac_platform.h" @@ -1335,6 +1336,8 @@ static int rk_gmac_powerup(struct rk_pri return ret; } + pm_runtime_get_sync(dev); + if (bsp_priv->integrated_phy) rk_gmac_integrated_phy_powerup(bsp_priv); @@ -1346,6 +1349,8 @@ static void rk_gmac_powerdown(struct rk_ if (gmac->integrated_phy) rk_gmac_integrated_phy_powerdown(gmac); + pm_runtime_put_sync(&gmac->pdev->dev); + phy_power_on(gmac, false); gmac_clk_enable(gmac, false); } Patches currently in stable-queue which might be from punitagrawal@xxxxxxxxx are queue-5.10/net-stmmac-dwmac-rk-fix-ethernet-on-rk3399-based-devices.patch