]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net: ethernet: ti: cpsw: fix ASSERT_RTNL() warning during suspend
authorGrygorii Strashko <grygorii.strashko@ti.com>
Fri, 22 May 2020 17:09:28 +0000 (20:09 +0300)
committerDavid S. Miller <davem@davemloft.net>
Sat, 23 May 2020 23:33:20 +0000 (16:33 -0700)
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: f5ffcc44a804 ("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>
drivers/net/ethernet/ti/cpsw.c

index c2c5bf87da0141cf32f2eea976936cf922774edf..ffeb8633e5305a40a0698f19c816059a3a92413d 100644 (file)
@@ -1753,11 +1753,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);