From patchwork Tue Aug 22 18:50:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 13361344 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 19B3BEE49AE for ; Tue, 22 Aug 2023 18:51:34 +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:Date:Message-Id:MIME-Version:Subject:Cc :To:From:References:In-Reply-To:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=kx18aZAjejQaZ4wrQmLygJx+EJBEYfDMq3Or3OvReFs=; b=bRx6HV9rxgRH9p aYHrpqnKOqCUM4xUB/R2b4YtvG7ecfbZqqMg/qBfHx7R2hHnbEJdkSc2IGQVnGiX1GdPlqXh9oMaO 8DeXUImnsOrnFxkQ5l3eS+hLQm7K52im9cykbshqfPRV6bJHEshApoKL96RFETIzB42jPKNYxxkDM wZ4RLlc9UsSDoQAXq0JmxtgZsJ+AubeNvjueiv8XyMtH1JPqiW4VcFm4h3fk9LBGXSsVBScY3vROW V9WTGERXhKLmGptJ41jaEoji7LDE20xTC31+EYVEn6r60bEz/bTlMtR25BgL9NbmMc9EEjT/1qmiV V1XS0TrCPbAkFR5i3Tpg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qYWT3-00GfDI-3B; Tue, 22 Aug 2023 18:51:05 +0000 Received: from [2001:4d48:ad52:32c8:5054:ff:fe00:142] (helo=pandora.armlinux.org.uk) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qYWSn-00Gf5v-2G for linux-arm-kernel@lists.infradead.org; Tue, 22 Aug 2023 18:50:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Date:Sender:Message-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References: In-Reply-To:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=nphjihgOb/6ZWNEn5bdh2uvaeqrnXDrlYgYpyu/X48Y=; b=c5TqPRogkTgyX2mtAOV7dKA4QF 9Nb2U0HplGQv5Om2/s6XztHrEnoLHkisXNAAYcqvJSwUVVKVWLZ3uZnr/4x2ZFtjOun7WxLwca+G8 tk/G320BIPhvtmykEllqrmVi40NSyelVY4YI6K3wVc64J+OmRRnIXhY07y7ZUAOPs7XLxdnSpR+7j eVN6PwvuuRP/tWLG5jTEo8AX5frKWvaco1MXuqgBR8+yqnTf/2l7QOaIfa9E3SKyo09VTISvhWEHF TZ05UoqwPkC5JecI/FvT4yMGcAJrJDecV3KZp/9vFQuYiFpIJWDsg4lvNJJnHbVooNiDMFKdse6BH KTsuCW4g==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:50524 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1qYWSi-0001tG-1j; Tue, 22 Aug 2023 19:50:44 +0100 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.94.2) (envelope-from ) id 1qYWSi-005fYL-Q0; Tue, 22 Aug 2023 19:50:44 +0100 In-Reply-To: References: From: "Russell King (Oracle)" To: Alexandre Torgue , Jose Abreu Cc: Andrew Lunn , "David S. Miller" , Eric Dumazet , Feiyang Chen , Heiner Kallweit , Jakub Kicinski , linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, Maxime Coquelin , netdev@vger.kernel.org, Paolo Abeni Subject: [PATCH net-next 9/9] net: stmmac: move priv->phylink_config.mac_managed_pm MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Tue, 22 Aug 2023 19:50:44 +0100 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230822_115049_740129_514026EB X-CRM114-Status: GOOD ( 10.24 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Move priv->phylink_config.mac_managed_pm to be along side the other phylink initialisations. Signed-off-by: Russell King (Oracle) --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 5cf8304564c6..7cfc2918c913 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -1207,6 +1207,7 @@ static int stmmac_phy_setup(struct stmmac_priv *priv) priv->phylink_config.dev = &priv->dev->dev; priv->phylink_config.type = PHYLINK_NETDEV; + priv->phylink_config.mac_managed_pm = true; mdio_bus_data = priv->plat->mdio_bus_data; if (mdio_bus_data) @@ -1231,7 +1232,6 @@ static int stmmac_phy_setup(struct stmmac_priv *priv) if (priv->plat->tx_queues_to_use > 1) priv->phylink_config.mac_capabilities &= ~(MAC_10HD | MAC_100HD | MAC_1000HD); - priv->phylink_config.mac_managed_pm = true; max_speed = priv->plat->max_speed; if (max_speed)