From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C7F40C433DF for ; Thu, 28 May 2020 12:05:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9DEB021548 for ; Thu, 28 May 2020 12:05:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590667551; bh=Hmnlnv9nFU6PTw7F+vd337vnvowVzLF2H7YfcS0VCgQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZU9lR6Uvlo/InH6I6zu5x+jEe0fm6Zk80zt2gPDxTcvPaDde2h2j9w37uhsei6vGY IRGC2PWehNHnLXPzWCFhVZktOscWW9FtVp9HiNqkyoTOKDfmg2bfUnXvm4nEFvpmFZ 2HThHqsGK5DgBgaZpSnbI2ZptDe/kraKAQ8rC79E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388722AbgE1L4z (ORCPT ); Thu, 28 May 2020 07:56:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:49106 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388847AbgE1L4w (ORCPT ); Thu, 28 May 2020 07:56:52 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 42F9621475; Thu, 28 May 2020 11:56:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590667011; bh=Hmnlnv9nFU6PTw7F+vd337vnvowVzLF2H7YfcS0VCgQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JUgQ7iI7GoKpF5bBCKcCIjr/Fss6QcITFr4xY0gTlCvgTKkB2RJ15NNQVpJcGzgYw 1raLlbsKb4S5vWdeClCxd3ElKGZ4iWBgZ6zpWgdWhr0tegBvFTUn0sUilhLA9T2TCu yqB1bEwLelFa7Bu+n81+TTHCaPVkrCyrtGJUNYZ0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Grygorii Strashko , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.6 45/47] net: ethernet: ti: cpsw: fix ASSERT_RTNL() warning during suspend Date: Thu, 28 May 2020 07:55:58 -0400 Message-Id: <20200528115600.1405808-45-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200528115600.1405808-1-sashal@kernel.org> References: <20200528115600.1405808-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Grygorii Strashko [ 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 Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- 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