From mboxrd@z Thu Jan 1 00:00:00 1970 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 A0F441DE3B7; Mon, 19 Jan 2026 12:34:06 +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=1768826048; cv=none; b=UqxiDqeVJwYnCUDHqwkU+UZ4jUWhcoIJVhP6BaAxLT+hzH5eFIHx1TZuteVP4jXSn6hO6mAQ2ciqAZQ2nnCL/U/dzQ5zClKH/5MSjMyjcA6/oJfp4XedVgN0PkgSyUP/ISeJCkqEa/8/BME9Ss/q5WStIeHrb7YHiKYxGUY9/tw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768826048; c=relaxed/simple; bh=56CE9R5aafUvOC0Qr9SX3HByrWjX36UjEl7BS91y2w4=; h=In-Reply-To:References:From:To:Cc:Subject:MIME-Version: Content-Disposition:Content-Type:Message-Id:Date; b=umdk+xxDKF3hDiKzo9iopnE5nH4DyBPF29bOmpevNwQJnY8rAvrucl6wtiTEo+LuNRoHQozCYAbRdvGQCV6Xm047nZq3F+cLhc+X38F/hEnID901XXcQljmwBvwajqZC7R+CO6aQN4ce1dqL7Vyh88yUlq4pYHBny44PVsoSYI8= 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=DxKdwg6I; 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="DxKdwg6I" 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=PZh72J4Tq0dy1l0Nj6WDkQvyxSW++B/372OvBmFERyE=; b=DxKdwg6Iliff8vFMAruL13j1ee jMhJHsxsj+SyM1UYZIMY9IkJ0nn282naPV67wDkhpQ9/f9YNon8Q/mOdNfrO0EsgtVcmqaa11x18x ZNpqLHLJN5M/OBGKJnm2In5uUeO4yVh7QWyHqy7DPbbknRNb+wX1DaupEVtN6bjypQhV16WS/TGbe s5guCoVMMcvE6FHuNzUHJ3p2LHe7j7y/myOEYp3HT1EporT5CngstNZfocLkGhytw/cMebCjZpLoJ S/T7BPahxKvVqx968BY+zZc+f2OJ4xVBvJoQp36fQajgHHSB38BTXsB3cbvNHPPVsl03xnR08aUxw gDQCbUsg==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:55614 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.98.2) (envelope-from ) id 1vhoSE-0000000052U-2qwL; Mon, 19 Jan 2026 12:33:58 +0000 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.98.2) (envelope-from ) id 1vhoSC-00000005H1Z-2Bux; Mon, 19 Jan 2026 12:33:56 +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 , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, Maxime Chevallier , Maxime Coquelin , Mohd Ayaan Anwar , Neil Armstrong , netdev@vger.kernel.org, Paolo Abeni , Vinod Koul Subject: [PATCH net-next 04/14] net: stmmac: wrap phylink's rx_clk_stop functions Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Message-Id: Sender: Russell King Date: Mon, 19 Jan 2026 12:33:56 +0000 With generic SerDes support, stmmac will need to do more work to ensure that clk_rx_i is running in all configurations. Rather than turn each site that calls phylink_rx_clk_stop_xxx() into a list of functions, move these to their own pair of functions so that they can be augmented at a single location. Reviewed-by: Maxime Chevallier Signed-off-by: Russell King (Oracle) --- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index c2589f02ff7e..24a2555ca329 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -3547,6 +3547,16 @@ static void stmmac_safety_feat_configuration(struct stmmac_priv *priv) } } +static void stmmac_clk_rx_i_require(struct stmmac_priv *priv) +{ + phylink_rx_clk_stop_block(priv->phylink); +} + +static void stmmac_clk_rx_i_release(struct stmmac_priv *priv) +{ + phylink_rx_clk_stop_unblock(priv->phylink); +} + /** * stmmac_hw_setup - setup mac in a usable state. * @dev : pointer to the device structure. @@ -3578,12 +3588,12 @@ static int stmmac_hw_setup(struct net_device *dev) * Block the receive clock stop for LPI mode at the PHY in case * the link is established with EEE mode active. */ - phylink_rx_clk_stop_block(priv->phylink); + stmmac_clk_rx_i_require(priv); /* DMA initialization and SW reset */ ret = stmmac_init_dma_engine(priv); if (ret < 0) { - phylink_rx_clk_stop_unblock(priv->phylink); + stmmac_clk_rx_i_release(priv); netdev_err(priv->dev, "%s: DMA engine initialization failed\n", __func__); return ret; @@ -3591,7 +3601,7 @@ static int stmmac_hw_setup(struct net_device *dev) /* Copy the MAC addr into the HW */ stmmac_set_umac_addr(priv, priv->hw, dev->dev_addr, 0); - phylink_rx_clk_stop_unblock(priv->phylink); + stmmac_clk_rx_i_release(priv); /* Initialize the MAC Core */ stmmac_core_init(priv, priv->hw, dev); @@ -3670,9 +3680,9 @@ static int stmmac_hw_setup(struct net_device *dev) /* Start the ball rolling... */ stmmac_start_all_dma(priv); - phylink_rx_clk_stop_block(priv->phylink); + stmmac_clk_rx_i_require(priv); stmmac_set_hw_vlan_mode(priv, priv->hw); - phylink_rx_clk_stop_unblock(priv->phylink); + stmmac_clk_rx_i_release(priv); return 0; } @@ -6107,9 +6117,9 @@ static int stmmac_set_features(struct net_device *netdev, else priv->hw->hw_vlan_en = false; - phylink_rx_clk_stop_block(priv->phylink); + stmmac_clk_rx_i_require(priv); stmmac_set_hw_vlan_mode(priv, priv->hw); - phylink_rx_clk_stop_unblock(priv->phylink); + stmmac_clk_rx_i_release(priv); return 0; } @@ -6378,9 +6388,9 @@ static int stmmac_set_mac_address(struct net_device *ndev, void *addr) if (ret) goto set_mac_error; - phylink_rx_clk_stop_block(priv->phylink); + stmmac_clk_rx_i_require(priv); stmmac_set_umac_addr(priv, priv->hw, ndev->dev_addr, 0); - phylink_rx_clk_stop_unblock(priv->phylink); + stmmac_clk_rx_i_release(priv); set_mac_error: pm_runtime_put(priv->device); @@ -8192,11 +8202,11 @@ int stmmac_resume(struct device *dev) stmmac_init_timestamping(priv); stmmac_init_coalesce(priv); - phylink_rx_clk_stop_block(priv->phylink); + stmmac_clk_rx_i_require(priv); stmmac_set_rx_mode(ndev); stmmac_restore_hw_vlan_rx_fltr(priv, ndev, priv->hw); - phylink_rx_clk_stop_unblock(priv->phylink); + stmmac_clk_rx_i_release(priv); stmmac_enable_all_queues(priv); stmmac_enable_all_dma_irq(priv); -- 2.47.3