lkml.org 
[lkml]   [2021]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 071/151] net: stmmac: dwmac-rk: Fix ethernet on rk3399 based devices
    Date
    From: Punit Agrawal <punitagrawal@gmail.com>

    [ Upstream commit aec3f415f7244b7747a7952596971adb0df2f568 ]

    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@sntech.de>
    Signed-off-by: Punit Agrawal <punitagrawal@gmail.com>
    Cc: Michael Riesch <michael.riesch@wolfvision.net>
    Tested-by: Heiko Stuebner <heiko@sntech.de>
    Link: https://lore.kernel.org/r/20210929135049.3426058-1-punitagrawal@gmail.com
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 5 +++++
    1 file changed, 5 insertions(+)

    diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
    index ed817011a94a..6924a6aacbd5 100644
    --- 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"

    @@ -1528,6 +1529,8 @@ static int rk_gmac_powerup(struct rk_priv_data *bsp_priv)
    return ret;
    }

    + pm_runtime_get_sync(dev);
    +
    if (bsp_priv->integrated_phy)
    rk_gmac_integrated_phy_powerup(bsp_priv);

    @@ -1539,6 +1542,8 @@ static void rk_gmac_powerdown(struct rk_priv_data *gmac)
    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);
    }
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-10-11 16:11    [W:4.101 / U:0.248 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site