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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1E226E82CBB for ; Wed, 27 Sep 2023 17:58:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=iDrPxXng+ULjC8QTQbjHoFtwNZMn0DMHqikQVPMtvuc=; b=gzY2zLSa8W13wi DkD78jYKNbeLZyck+w+oJ6kzhnbScjwLCXq2uTTG5/VkF1Uh8HsFWxaelVf9rBxRnAW7i6rg2g7/s 6sB6juB8i3ZLA9HGee3WcQxEJXCGHaSK7GHh8fiF8jt1JO7zcTWubSdEIEEONBNyppt8+Nt4Ne8iZ 1AzNzJwR0Mgz23fz/J5A5wgH4F367kvyOp6b2D4sQruni5oQHpco8i2pHAyql/GQgeGYha9G3teij Bx2hiz59yxsEEUYw2/SFTdb/0V+n72uZJqqiQf4vsuG9YISgT5/5MvgfOPnmY8N2zFx1T2hp0JAwp VRn3TDVGr4OdrY7m3pYw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qlYne-001XaU-0w; Wed, 27 Sep 2023 17:58:14 +0000 Received: from mail-qt1-x842.google.com ([2607:f8b0:4864:20::842]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qlYna-001XYS-0L for linux-arm-kernel@lists.infradead.org; Wed, 27 Sep 2023 17:58:13 +0000 Received: by mail-qt1-x842.google.com with SMTP id d75a77b69052e-4194d89a6dfso26995471cf.0 for ; Wed, 27 Sep 2023 10:58:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hefring-com.20230601.gappssmtp.com; s=20230601; t=1695837486; x=1696442286; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=AQzb+SwvsGBOEDzBjP4js4Sz2yj+gakJ7LKev+o0njQ=; b=SgljlYPcRn2mtFBGqU/JvWv8RKHEpMMIaRPgkJw+FMkkA/Av6dlVCXNhZQhFpN7K1b 7c3muGGGRHkdzLtaSvfxSMsO9r3z2VpRsPBFYugx3LpUo0wYiAS9ZvJNJC+Ay9PDltkF 9k9iXCRqEUY3UIbwFvPuJNtp4YoZhZlQ5zfTES5fd8qI/VHPcI8p+bex2JNg5kRXjH4L /CeEvNWs+UA8ys1ldmM8irS0GbDMMjl7HqjpU4PzqLjKdADq1A8x+gh89C0zI5cWXvWF kBMaouJAC1XBmSU0iTGsB0w9r8nmOSL2qbGpvCISjHzmq27b0OnHr/p3RMnxC5QqBdoQ GArg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695837486; x=1696442286; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=AQzb+SwvsGBOEDzBjP4js4Sz2yj+gakJ7LKev+o0njQ=; b=iaXsCeXW2iCEwfGcAw/DaDc2ADQV52S6yqp8ict2HEgQvTh6tnZdT6ULSf8RASKu/t Q+pRUjxp5/x+Si4RsVhEnVz2G4R16IlPbbEYxv4Ymd7EafejKi6HBlne+3zz3D2yEtqW DQ2K2tcJATO5dNjb2p+JEsD56Z+xAG3XVdqRnYbxR6ghUvcMhDB3jaAA8EoLh1nzmmBb KjcU7fVZMrHLdO5AXsV3Mtwkfy/bBIkeQGKZhMs0HbNBvShx3rhcZyFfFxGTUM6d5N0R Xh+ZHLrwMuF0fVCWxZv7yG8u+ZDIt6Cujh5AF0ANLiqCWuSB9z/lmSUvEYRueSb6lSbx IGVw== X-Gm-Message-State: AOJu0YzMsFFp4uju3vsmY8OUX29xijGwKkWJe4XvQKoNVv7/BXKOkAOo OZRda0HC2DBuZ+f/XlAjeSEK9g== X-Google-Smtp-Source: AGHT+IEBMS9WLtGs4+++Dzkg5Mo5nm24aZkgeo3xhxJJgHUp6UGYBeiOZLJhiw6Jv5TzrYz5ZxgiEQ== X-Received: by 2002:a05:622a:14b:b0:416:5ead:6171 with SMTP id v11-20020a05622a014b00b004165ead6171mr3362737qtw.47.1695837486383; Wed, 27 Sep 2023 10:58:06 -0700 (PDT) Received: from localhost.localdomain ([50.212.55.89]) by smtp.gmail.com with ESMTPSA id j4-20020ac84c84000000b004195b8554efsm711368qtv.24.2023.09.27.10.58.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 10:58:05 -0700 (PDT) From: Ben Wolsieffer To: linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Alexandre Torgue , Jose Abreu , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Christophe Roullier , Ben Wolsieffer Subject: [PATCH net] net: stmmac: dwmac-stm32: fix resume on STM32 MCU Date: Wed, 27 Sep 2023 13:57:49 -0400 Message-ID: <20230927175749.1419774-1-ben.wolsieffer@hefring.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230927_105810_359875_25F44303 X-CRM114-Status: GOOD ( 18.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The STM32MP1 keeps clk_rx enabled during suspend, and therefore the driver does not enable the clock in stm32_dwmac_init() if the device was suspended. The problem is that this same code runs on STM32 MCUs, which do disable clk_rx during suspend, causing the clock to never be re-enabled on resume. This patch adds a variant flag to indicate that clk_rx remains enabled during suspend, and uses this to decide whether to enable the clock in stm32_dwmac_init() if the device was suspended. This approach fixes this specific bug with limited opportunity for unintended side-effects, but I have a follow up patch that will refactor the clock configuration and hopefully make it less error prone. Fixes: 6528e02cc9ff ("net: ethernet: stmmac: add adaptation for stm32mp157c.") Signed-off-by: Ben Wolsieffer --- drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c index bdb4de59a672..28c8ca5fba6c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c @@ -105,6 +105,7 @@ struct stm32_ops { int (*parse_data)(struct stm32_dwmac *dwmac, struct device *dev); u32 syscfg_eth_mask; + bool clk_rx_enable_in_suspend; }; static int stm32_dwmac_init(struct plat_stmmacenet_data *plat_dat) @@ -122,7 +123,8 @@ static int stm32_dwmac_init(struct plat_stmmacenet_data *plat_dat) if (ret) return ret; - if (!dwmac->dev->power.is_suspended) { + if (!dwmac->ops->clk_rx_enable_in_suspend || + !dwmac->dev->power.is_suspended) { ret = clk_prepare_enable(dwmac->clk_rx); if (ret) { clk_disable_unprepare(dwmac->clk_tx); @@ -514,7 +516,8 @@ static struct stm32_ops stm32mp1_dwmac_data = { .suspend = stm32mp1_suspend, .resume = stm32mp1_resume, .parse_data = stm32mp1_parse_data, - .syscfg_eth_mask = SYSCFG_MP1_ETH_MASK + .syscfg_eth_mask = SYSCFG_MP1_ETH_MASK, + .clk_rx_enable_in_suspend = true }; static const struct of_device_id stm32_dwmac_match[] = { -- 2.42.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel