From patchwork Thu Dec 12 14:46:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 13905292 X-Patchwork-Delegate: kuba@kernel.org Received: from pandora.armlinux.org.uk (pandora.armlinux.org.uk [78.32.30.218]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 596132153E4 for ; Thu, 12 Dec 2024 14:46:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=78.32.30.218 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734014812; cv=none; b=GPBSXM4J8HUachW0O8lNvvFULbp0szNSZR+r0keynvX2TdbhMCDzPTVsCjnU06w2jJkr55Bm+b20rpXfV46DG5x/cv2lijIEWm6EQ76S2UZAqFwqBNQumrdeftxE9IsQd3d62kIVNjWNAou8Gw3LYN8g1FL1cfr5Z9ZtNuqq50Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734014812; c=relaxed/simple; bh=Tr/jpZ5Ap1CbrJw5S0tLqG/j7ZR8LijQz/LKQSJVuGk=; h=In-Reply-To:References:From:To:Cc:Subject:MIME-Version: Content-Disposition:Content-Type:Message-Id:Date; b=RMX6vXdWIYtO6EphvPYkqatuePrPWKPmnoXHFksK0lAdK1++lO3CXZaRdVCPYlU5m8viQjtjTSWhwweHXUdUsLF0SvAH3GfnM+y3oigegX6aRi1toZl5rbQ3vXm8rbHIaTCd4u6R76gZimkFk8v1egnG3tXJWf2rqapfd7HAkdA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=armlinux.org.uk; spf=none smtp.mailfrom=armlinux.org.uk; dkim=pass (2048-bit key) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b=EIu76jPN; arc=none smtp.client-ip=78.32.30.218 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=armlinux.org.uk Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=armlinux.org.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b="EIu76jPN" 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=KhIAr6sYbHzP3Zk2rqpBh+lUMGaDCeFEVopN6YGrz/Q=; b=EIu76jPNlvsXeYBYwlOpV2jkhz NR7itOu+5FeCC846y8m/Oyrj812aBE5msXRAEE9HqL09mjRaYMDLBXBsl9iGvJBPiU5FbfueAwrRu puWh3tqZL4Fsk3AMlUUCxCffBiylAt8rDNeBjbwFVU5fR7aKhpVUFg0KyqB/0dCY5ou7aSAw7HyUH jJaD6E3+SibcQASHohGvDZ+DB9OxRbAwNFMRyghc3f1fAMedMHYIPrdrxypywZvt/QP+KjRsaIufn bYmIRo+BrQEzqkCJ3uLEHyeJ+sWrH75h4G/+VG+xfdIcIpTWQjifRtVbm1q3I1S1fI7/NdZJ1Z8lI ri3gvi6g==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:55610 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 1tLkSf-0005Ks-1g; Thu, 12 Dec 2024 14:46:41 +0000 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.94.2) (envelope-from ) id 1tLkSc-006qfZ-Vc; Thu, 12 Dec 2024 14:46:39 +0000 In-Reply-To: References: From: "Russell King (Oracle)" To: Andrew Lunn , Heiner Kallweit Cc: Alexandre Torgue , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Jose Abreu , 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 3/7] net: stmmac: make EEE depend on phy->enable_tx_lpi Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline Message-Id: Sender: Russell King Date: Thu, 12 Dec 2024 14:46:38 +0000 X-Patchwork-Delegate: kuba@kernel.org Make stmmac EEE depend on phylib's evaluation of user settings and PHY negotiation, as indicated by phy->enable_tx_lpi. This will ensure when phylib has evaluated that the user has disabled LPI, phy_init_eee() will not be called, and priv->eee_active will be false, causing LPI/EEE to be disabled. This is an interim measure - phy_init_eee() will be removed in a later patch. 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 d202bee73b8f..75f540d7ec7d 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -1088,7 +1088,7 @@ static void stmmac_mac_link_up(struct phylink_config *config, stmmac_mac_set(priv, priv->ioaddr, true); if (phy && priv->dma_cap.eee) { - priv->eee_active = + priv->eee_active = phy->enable_tx_lpi && phy_init_eee(phy, !(priv->plat->flags & STMMAC_FLAG_RX_CLK_RUNS_IN_LPI)) >= 0; priv->eee_enabled = stmmac_eee_init(priv);