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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3C595C19F2A for ; Thu, 11 Aug 2022 16:22:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237804AbiHKQWm (ORCPT ); Thu, 11 Aug 2022 12:22:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238001AbiHKQVJ (ORCPT ); Thu, 11 Aug 2022 12:21:09 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A0C62AC9; Thu, 11 Aug 2022 09:03:33 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D13A76133D; Thu, 11 Aug 2022 16:03:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 69AA5C433D7; Thu, 11 Aug 2022 16:03:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660233812; bh=D5hKPEg7EA5umWGwy1OZWtz442FFe0TMYJXhD8I1R6A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZAxm7beqKhXUxYZ6mVIYYpKdEKo0Ou9K7YHxWiESGHycUnErAZ5ipMkogE5CiQ76o T747rpP/1taNSn0Xzwucx+/qrABp4vESq1PLZrMH3EzZUfRQ7vnHKOHKJ2uqI0/sqK cNoOKtdSE3AuoefNM5ndxTHEc/T2jUwSoQlSJ7PZ5r/k6692Iqim9+np6xKHbdB/Fg NJXR4iDPgsyyEVYB4D39qaLM1gCwp3QjHTQHOrIfJGLQA/2gfki1HS6Jzdgo6o8wFE PZqhmOY0lx/mVU4B6n598hB8KNnOq/dyjSGWlIsitMBfoVxsV6yRp8SQApMc9yEd5x iTq88N+Psay1w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Christian Marangi , Jakub Kicinski , Sasha Levin , peppe.cavallaro@st.com, alexandre.torgue@foss.st.com, joabreu@synopsys.com, davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, mcoquelin.stm32@gmail.com, netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.15 62/69] net: ethernet: stmicro: stmmac: first disable all queues and disconnect in release Date: Thu, 11 Aug 2022 11:56:11 -0400 Message-Id: <20220811155632.1536867-62-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220811155632.1536867-1-sashal@kernel.org> References: <20220811155632.1536867-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christian Marangi [ Upstream commit 7028471edb646bfc532fec0973e50e784cdcb7c6 ] Disable all queues and disconnect before tx_disable in stmmac_release to prevent a corner case where packet may be still queued at the same time tx_disable is called resulting in kernel panic if some packet still has to be processed. Signed-off-by: Christian Marangi Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 3a6283cf8fd4..f53a0588fefb 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -3817,8 +3817,6 @@ static int stmmac_release(struct net_device *dev) struct stmmac_priv *priv = netdev_priv(dev); u32 chan; - netif_tx_disable(dev); - if (device_may_wakeup(priv->device)) phylink_speed_down(priv->phylink, false); /* Stop and disconnect the PHY */ @@ -3830,6 +3828,8 @@ static int stmmac_release(struct net_device *dev) for (chan = 0; chan < priv->plat->tx_queues_to_use; chan++) hrtimer_cancel(&priv->tx_queue[chan].txtimer); + netif_tx_disable(dev); + /* Free the IRQ lines */ stmmac_free_irq(dev, REQ_IRQ_ERR_ALL, 0); -- 2.35.1