lkml.org 
[lkml]   [2020]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.6 213/606] net: ethernet: ti: cpsw: fix ASSERT_RTNL() warning during suspend
    Date
    From: Grygorii Strashko <grygorii.strashko@ti.com>

    [ Upstream commit 4c64b83d03f4aafcdf710caad994cbc855802e74 ]

    vlan_for_each() are required to be called with rtnl_lock taken, otherwise
    ASSERT_RTNL() warning will be triggered - which happens now during System
    resume from suspend:
    cpsw_suspend()
    |- cpsw_ndo_stop()
    |- __hw_addr_ref_unsync_dev()
    |- cpsw_purge_all_mc()
    |- vlan_for_each()
    |- ASSERT_RTNL();

    Hence, fix it by surrounding cpsw_ndo_stop() by rtnl_lock/unlock() calls.

    Fixes: 15180eca569b ("net: ethernet: ti: cpsw: fix vlan mcast")
    Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/ti/cpsw.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
    index 6ae4a72e6f43..5577ff0b7663 100644
    --- a/drivers/net/ethernet/ti/cpsw.c
    +++ b/drivers/net/ethernet/ti/cpsw.c
    @@ -1752,11 +1752,15 @@ static int cpsw_suspend(struct device *dev)
    struct cpsw_common *cpsw = dev_get_drvdata(dev);
    int i;

    + rtnl_lock();
    +
    for (i = 0; i < cpsw->data.slaves; i++)
    if (cpsw->slaves[i].ndev)
    if (netif_running(cpsw->slaves[i].ndev))
    cpsw_ndo_stop(cpsw->slaves[i].ndev);

    + rtnl_unlock();
    +
    /* Select sleep pin state */
    pinctrl_pm_select_sleep_state(dev);

    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-09 02:29    [W:4.931 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site