From patchwork Tue Sep 17 10:02:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loys Ollivier X-Patchwork-Id: 173887 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp911128ill; Tue, 17 Sep 2019 03:02:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqxKeBki9I+fIYY2B+6XJe1IjqjqouyHYydR14GKnNB1W7T+Kq9TVagTk2ylhLlZz6PifZW9 X-Received: by 2002:a17:906:860d:: with SMTP id o13mr3883309ejx.284.1568714574096; Tue, 17 Sep 2019 03:02:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568714574; cv=none; d=google.com; s=arc-20160816; b=VwfbvcXr5H0APPFOB4ws/Zx2WVkrKNPQDoYo/so7O32AnnHAYQ1F7UnNiKJD8LQJiS MqMe1Rm5wEWqH8ukdl6/pPEu6LF4pEZqaZHhLQGeGqfrwmaRESWvarBkXb/cKCqRc8Pb TvaMm8Mk+srLDk4YmM1xsbUdTpMdyHczeTN53KPHwDULwH+60h+AHXDRBJ2RLpF8O1du 7VuxzqiCcZgJaHepbqb8TeeyPQ7zu6QzSS6KRZv9gsxY/uDNB+wfQHs5hRQd1Oxu9yDv 9qjuQbfcGb4NQMj40JVDtn5LzelfJfG1+8OnSut/tBlo09c69Wylz0tD0VnmxSe15u8x mPyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=JugQhyARoBEh6axn1GkenUD1F8NS4zAnUz5g+2UjW9Y=; b=oZ6lLfkXD1XkWJjagSHOf2odVNEEC//jAupkjqRnpRw+DNDNSPLkLFegzZDaUC+mFm qHFhFBeCZw6SlRhQWVqDYieJwt2UCy8WoN88RE6/cL4OBqu9ibaiIPZJxxNJtt3Jev8h oxAral3YhrWWoQv4jzt+IJOHGKvjZkX0C1gWOw2flhliUqzbF6gVYMFSn6fpz20I2keG 2fmg9Fgiko/Beo2x/H5GcBSWGjRRoU9EzAS9eUyjabLHSSR+Zw2+BxZLYTChELiMXw6h sQnSgvfLnjJG7A4Xq3B+RhRdI45jTT1mZFSM9K/osqzlTHvYBa3JniMotz63j8aPwH6u +zCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b="q/Lr9BOq"; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h2si996359edw.29.2019.09.17.03.02.53; Tue, 17 Sep 2019 03:02:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b="q/Lr9BOq"; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726349AbfIQKCu (ORCPT + 8 others); Tue, 17 Sep 2019 06:02:50 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:38850 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725847AbfIQKCt (ORCPT ); Tue, 17 Sep 2019 06:02:49 -0400 Received: by mail-wr1-f65.google.com with SMTP id l11so2456930wrx.5 for ; Tue, 17 Sep 2019 03:02:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=JugQhyARoBEh6axn1GkenUD1F8NS4zAnUz5g+2UjW9Y=; b=q/Lr9BOq/L69g4WCoKZCQ9TczATMdKu2UawnxeFAE+hhNHZC76GVOZJCaSxtRLRMi4 hkww4gqPUO130c9uk0yzzLEpRWXquoI4YYvL1Z8XV4HfAgn45Zjk2Yb+ogUj2fbaj4js BtYrJMb6vHZyh/cZTduvyN8X2er9+XHOVcfOg+z/VJMtfts6WzKUdX5FPAvNW3OATEFU Yt5ad+VCWxlEuhQRRKjESvaqIOFBGf1TI1VfoMA9PBmo9Q6INw9uFPjKAv98Gclwv0IB Q6G3JXvEiT8BaNzZBYDDifwAndqQ4Fz7SMDkuA+DbQ2glFx7Aag70O2VNnVHdkA1ib+6 RmwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=JugQhyARoBEh6axn1GkenUD1F8NS4zAnUz5g+2UjW9Y=; b=pFJzL7DPoBLoqCAKwH8L4YFFXo+KxusXMpDxb15gL5rb+BDJrS/v+2NeJiEILYKMUw 2gz75xeKDCmIcj+zeP1ACXt63e2X0t2+IcD5t66opbeFfgD9sdxv9DNyxl78+fvSshuQ CUGWQT+ck7ztbUuEiGjKofpyR8A2GCeBj7kOfys/GQf+Z++KDvC1kdMEW7ejJ79FC66U gpev+hpb2XsPRZzwlRIjcN+5Cqr6IdsPLNrget0jBT2oBATZYsBpT3MVj//UCxN1VK65 9p/Dcc+zxcd3YjQYwO05SZRJVq5Ao2b5ydL/YFGVAkZSJKD21DxlHHfQgFr8HeFKr4u6 +8lw== X-Gm-Message-State: APjAAAVrj8K+y2wYC1mIu8OHxYrQqkqzZeb2qMu3F32fBDx6rThhqlgS N6K9dYTzLjUmhqK4er01KzEUiA== X-Received: by 2002:a5d:6951:: with SMTP id r17mr2232769wrw.208.1568714567756; Tue, 17 Sep 2019 03:02:47 -0700 (PDT) Received: from loys-ubuntu-BY1835A49200471.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id x129sm1606696wmg.8.2019.09.17.03.02.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Sep 2019 03:02:46 -0700 (PDT) From: Loys Ollivier To: Russell King , Maxime Coquelin Cc: Loys Ollivier , Jose Abreu , "David S. Miller" , Giuseppe Cavallaro , Alexandre Torgue , netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: stmmac: Fix ASSERT_RTNL() warning on suspend/resume Date: Tue, 17 Sep 2019 12:02:36 +0200 Message-Id: <1568714556-25024-1-git-send-email-lollivier@baylibre.com> X-Mailer: git-send-email 2.7.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org rtnl_lock needs to be taken before calling phylink_start/stop to lock the network stack. Fix ASSERT_RTNL() warnings by protecting such calls with lock/unlock. Fixes: 74371272f97f ("net: stmmac: Convert to phylink and remove phylib logic") Signed-off-by: Loys Ollivier --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.7.4 diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index fd54c7c87485..485f33f57b43 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -4451,7 +4451,9 @@ int stmmac_suspend(struct device *dev) if (!ndev || !netif_running(ndev)) return 0; + rtnl_lock(); phylink_stop(priv->phylink); + rtnl_unlock(); mutex_lock(&priv->lock); @@ -4560,7 +4562,9 @@ int stmmac_resume(struct device *dev) mutex_unlock(&priv->lock); + rtnl_lock(); phylink_start(priv->phylink); + rtnl_unlock(); return 0; }