From patchwork Mon Apr 7 18:58:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 14041864 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 0A052C36010 for ; Mon, 7 Apr 2025 21:47:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Date: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-Owner; bh=WNdh5DzKkHzYa5BInKwu7W+JyJ1xHiWn4QJkYHQJpjQ=; b=4o99W8YhqaVAZybbDGUsL41UXx CY8fORexUALHnBMa3vnoFd8IYqmSZX97ESF1M3Qru4WunwzRTitX2KbofkTaUUWS6wE4h4jVaMa6x wi6xI88lFPbz5g0ImUGIOzMLEbf1jFPvV9juuecytqedMS9UtrhQcvNpvABtf6N0fKDQ7eMGOPnXk ilX6UEqVdu8pqikkG+54PDpOZ6x1rxIT5HHfBluBT7zUEhDI3vkXAcjYBvCGwv5HtiLnzRfK7njmC cDCJ04ihK7IFVk6BZJ2dsgVBf+ywzXn4cSGK67Ib4ih7+qe/yW3YHYh6Dx+bhEvGljizJUQtR/+fx kLfchi/w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1u1uJ3-000000024Pa-2Kwi; Mon, 07 Apr 2025 21:47:01 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1u1rgw-00000001j2T-43IM for linux-arm-kernel@bombadil.infradead.org; Mon, 07 Apr 2025 18:59:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; 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; bh=WNdh5DzKkHzYa5BInKwu7W+JyJ1xHiWn4QJkYHQJpjQ=; b=WE/ZtwsP/xmJnlKb8R4DzEOAXJ 7tLrP0jAchtZ8vH39hwTsbx7sXBEmyz+h9qIzR7AF97U1KBC+lJsbbZuJtEJ6AwqPHKQ4sSiVfdkY j+/bggxlu3YlNtiHFZm/N6Xfkdv3aDEIrywXoAo/oQqiDpnfTq4VK1sEJB3Cw28xMbXmoaJSM8u16 oQVUsPyercSiHuy1mK5cUpR3MehexwbR6Y4DV2v8kLyIsgEEkUhu06G3lz6vjvWAx2VJDd69E7sZE FAzNa5WxGbW2cuzsU3328d3B3Fi/MM2/i/nX+CS2jPy3hdGBKdRInpj84KAgkai7HDST4okNCd9Bo XjWl4Q5A==; Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:32c8:5054:ff:fe00:142]) by desiato.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1u1rgu-000000086gF-0l05 for linux-arm-kernel@lists.infradead.org; Mon, 07 Apr 2025 18:59:29 +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=WNdh5DzKkHzYa5BInKwu7W+JyJ1xHiWn4QJkYHQJpjQ=; b=oe0T4ZWdJrQUHI1RLctiKWbMbQ jp7LrA30xsy5eMJj75+mY1+PDfwuCESzZsgUqxkkzIFQtCgMWz3lzemH6SMMeBRYEQdlslW5wAgJW v4/dH9NbZRlBHGZa+tGq3I1KJhazhmmCix6rDseVCvn7m3k9ZBLtRj+nMj6y7Tak/rPTS3j+c9DfC cMZrI6XkQamBGpkfkstrBdDRN/LmElz+gJrLcou6EkTQu6TFnHLPC/RNvh8BJEK+6jmT4cnWoUdXy sCGjDDnc1tCDDkQ7h5E2dtxCaDFXWHsbkY2XQSP1LJ0wAbsxxDFSkwt78a+JCLQnQ4VNUCRAsnZsH jGdbfzDQ==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:47696 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 1u1rgp-000697-0g; Mon, 07 Apr 2025 19:59:23 +0100 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.94.2) (envelope-from ) id 1u1rgJ-0013gd-2q; Mon, 07 Apr 2025 19:58:51 +0100 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 , Jon Hunter , linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, Maxime Coquelin , netdev@vger.kernel.org, Paolo Abeni , Philipp Zabel , Richard Cochran , Thierry Reding Subject: [PATCH net-next 1/5] net: stmmac: dwc-qos: remove tegra_eqos_init() MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Mon, 07 Apr 2025 19:58:51 +0100 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250407_195928_313965_864FDBA0 X-CRM114-Status: GOOD ( 13.96 ) 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 tegra_eqos_init() initialises the 1US TIC counter for the EEE timers. However, the DWGMAC core is reset after this write, which clears this register to its default. However, dwmac4_core_init() configures this register using the same clock, which happens after reset - thus this is the write which ensures that the register is correctly configured. Therefore, tegra_eqos_init() is not required and is removed. This also means eqos->clk_slave can also be removed. Signed-off-by: Russell King (Oracle) --- .../stmicro/stmmac/dwmac-dwc-qos-eth.c | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c index 126702873e2a..2b6ed0f720eb 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c @@ -29,7 +29,6 @@ struct tegra_eqos { void __iomem *regs; struct reset_control *rst; - struct clk *clk_slave; struct gpio_desc *reset; }; @@ -199,20 +198,6 @@ static void tegra_eqos_fix_speed(void *priv, int speed, unsigned int mode) } } -static int tegra_eqos_init(struct platform_device *pdev, void *priv) -{ - struct tegra_eqos *eqos = priv; - unsigned long rate; - u32 value; - - rate = clk_get_rate(eqos->clk_slave); - - value = (rate / 1000000) - 1; - writel(value, eqos->regs + GMAC_1US_TIC_COUNTER); - - return 0; -} - static int tegra_eqos_probe(struct platform_device *pdev, struct plat_stmmacenet_data *plat_dat, struct stmmac_resources *res) @@ -227,7 +212,6 @@ static int tegra_eqos_probe(struct platform_device *pdev, eqos->dev = &pdev->dev; eqos->regs = res->addr; - eqos->clk_slave = plat_dat->stmmac_clk; if (!is_of_node(dev->fwnode)) goto bypass_clk_reset_gpio; @@ -267,18 +251,12 @@ static int tegra_eqos_probe(struct platform_device *pdev, bypass_clk_reset_gpio: plat_dat->fix_mac_speed = tegra_eqos_fix_speed; plat_dat->set_clk_tx_rate = stmmac_set_clk_tx_rate; - plat_dat->init = tegra_eqos_init; plat_dat->bsp_priv = eqos; plat_dat->flags |= STMMAC_FLAG_SPH_DISABLE | STMMAC_FLAG_EN_TX_LPI_CLK_PHY_CAP; - err = tegra_eqos_init(pdev, eqos); - if (err < 0) - goto reset; - return 0; -reset: - reset_control_assert(eqos->rst); + reset_phy: gpiod_set_value(eqos->reset, 1); From patchwork Mon Apr 7 18:58:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 14041867 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 80357C369A1 for ; Mon, 7 Apr 2025 21:47:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Date: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-Owner; bh=hBtz6Ng9ArKpM+af3s56+9PEKH0n/HDxcMnPXlkcvuA=; b=14i6OADKNhI5qWCThOsbT3Xai4 S+chd0bCJp6tr44W9nd8xNzyi/knaLY6d89gWJTgxerKR1pg7MlNBV9qtElzQXfymvZvlxkFeik3W 6eWmQxCdr2dwGIsDtY+7NUGcijiZyloMLQAl7yCLaHciCanefWVLrhDoCgxTqJrOWLqsHczKFwBIz a2NGeE/Y6FFCtsFq/OOUuDGa2bf2f9f1P6BuqusLIo7lrY6JGfzpZuEPByNSE2YJXV3NxoLYtBLYm hV1h+GsOrBLOkuZeNIi1PItAN7+cmVOjE6B8GZNxKxm9L1TrPosssLgfugqrnC7rwNA5uKodsggBO HUo1kz0g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1u1uJ4-000000024RE-1cdN; Mon, 07 Apr 2025 21:47:02 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1u1rh0-00000001j3h-2eqG for linux-arm-kernel@bombadil.infradead.org; Mon, 07 Apr 2025 18:59:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; 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; bh=hBtz6Ng9ArKpM+af3s56+9PEKH0n/HDxcMnPXlkcvuA=; b=iL1GwE5q/u/xwzjrpwS3eJ9xDA t0+pEjNn4I/dRgMiLsOVe/8Oz90LgPgXEuerpRiAR8kJC/nU6bZsU8xSJe5/hKy1SotGe4PDXVX8G cLWUsq3zkCXnn6kU5jzNqTwPWqC6hUXG3eMRqObm/rtCfBDKZy+Y+paJdgZIcIdRnSnqZ0nOBSC3a Yg7qWixEgtN5CM4QVUGU8AUMZwtqePW5Y9QQpmYu/L+JfJSU0jQL/zVdta9++P+qhOsaY+hLEpzn9 Ak5C+Towq4uKNEgcaOhmg/R9DX5zQGz2RBDCbso3/5/BpsBzI0DBh4rp8Yz99gu+bt3TTXEDtl8V6 fTUV8qAQ==; Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:32c8:5054:ff:fe00:142]) by desiato.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1u1rgx-000000086gZ-3j6D for linux-arm-kernel@lists.infradead.org; Mon, 07 Apr 2025 18:59:33 +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=hBtz6Ng9ArKpM+af3s56+9PEKH0n/HDxcMnPXlkcvuA=; b=AHM7AwvqV0FmHKwQ5UK3nAs+qj awi//mBHqMSo2FRcyA9+f26sLvSxkzVniia8baE/vsSBybzSsISUUr9hzzmwEjAq15KpzexLzeCAb 6O0oTjLaeqqZ74TzSZ4gnMpviTo5tAk2BSWmJ07rYT4czyzUac0tjNn19rVWqr3nx0u1bScna6FCk 9TkPZAG63aeR94ECET0iIGMKM2nu7ocW4uNECGsgNVtKssr5Igc4aJYMSXhFo1lySkIz3hQx38JQO PBdH/+W8sH7B309esxeCfz4c094V4otWXu/o5wX9XZUkEMm9OmAsHZn+/LgwyPXegofBC8VvJUtfd uNN6TYmg==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:47702 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 1u1rgu-00069a-0n; Mon, 07 Apr 2025 19:59:28 +0100 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.94.2) (envelope-from ) id 1u1rgO-0013gj-5r; Mon, 07 Apr 2025 19:58:56 +0100 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 , Jon Hunter , linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, Maxime Coquelin , netdev@vger.kernel.org, Paolo Abeni , Philipp Zabel , Richard Cochran , Thierry Reding Subject: [PATCH net-next 2/5] net: stmmac: intel: remove eee_usecs_rate and hardware write MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Mon, 07 Apr 2025 19:58:56 +0100 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250407_195932_030435_589998A2 X-CRM114-Status: GOOD ( 11.62 ) 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 Remove the write to GMAC_1US_TIC_COUNTER for two reasons: 1. during initialisation or reinitialisation of the DWMAC core, the core is reset, which sets this register back to its default value. Writing it prior to stmmac_dvr_probe() has no effect. 2. Since commit 8efbdbfa9938 ("net: stmmac: Initialize MAC_ONEUS_TIC_COUNTER register"), GMAC4/5 core code will set this register based on the rate of plat->stmmac_clk. This clock is created by the same code which initialises plat->eee_usecs_rate, which is also created to run at this same rate. Since Marek's commit, this will set this register appropriately using the rate of this clock. Therefore, dwmac-intel.c writing GMAC_1US_TIC_COUNTER serves no useful purpose and can be removed. Signed-off-by: Russell King (Oracle) --- drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c index c8bb9265bbb4..54db5b778304 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c @@ -682,7 +682,6 @@ static int intel_mgbe_common_data(struct pci_dev *pdev, plat->axi->axi_blen[2] = 16; plat->ptp_max_adj = plat->clk_ptp_rate; - plat->eee_usecs_rate = plat->clk_ptp_rate; /* Set system clock */ sprintf(clk_name, "%s-%s", "stmmac", pci_name(pdev)); @@ -1313,13 +1312,6 @@ static int intel_eth_pci_probe(struct pci_dev *pdev, memset(&res, 0, sizeof(res)); res.addr = pcim_iomap_table(pdev)[0]; - if (plat->eee_usecs_rate > 0) { - u32 tx_lpi_usec; - - tx_lpi_usec = (plat->eee_usecs_rate / 1000000) - 1; - writel(tx_lpi_usec, res.addr + GMAC_1US_TIC_COUNTER); - } - ret = stmmac_config_multi_msi(pdev, plat, &res); if (ret) { ret = stmmac_config_single_msi(pdev, plat, &res); From patchwork Mon Apr 7 18:59:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 14041866 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 EB6FDC36010 for ; Mon, 7 Apr 2025 21:47:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Date: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-Owner; bh=xTONaCMGO+N+NO9JMd3j9lruIEiRtelFCdK2KAx5w+M=; b=SUfz3WcgVP+JXtG9I7O1GwD4q5 XzfoyxBKOkNY0LhP1TyHKLPgR2N9n4lSVZBooNQIaAjl4XJKaKclVXbNqn3xns4YskjuswFB/95yJ q5QPhhBhKZeaImUEYE3Dt7bN8NU+zCmhtnc1nXoGQkcPQgVsGbZzeP9cpPj5M+caRr0D9T1015BsJ 8muAbZb6SEB4Y/Y1nraDgyCWia16UDCoQOqtghSEXUpWjmJbDUx3fOvRFT0TLXXQY/yWTQdNV1jhs ImmU0yHtxEQWMVZr7Kn6LY/frR44NStw60ZUegmFL4DahLe79twdIbGKUo/Bgo2eLEGhV1ZHK6hLa CL+roUnQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1u1uJ5-000000024TH-1yme; Mon, 07 Apr 2025 21:47:03 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1u1rh6-00000001j5V-1IPQ for linux-arm-kernel@bombadil.infradead.org; Mon, 07 Apr 2025 18:59:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; 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; bh=xTONaCMGO+N+NO9JMd3j9lruIEiRtelFCdK2KAx5w+M=; b=ChY30GFWC3DDyUAuEGOsPDQWvh /cKsvBZRoELnoB4FMihKY3np9kLGS/TpfhQPISO3aDQT9LKfkK4626px0rUtUpQMD6NSoIyCt6JuR SHLSd9LGvUEECuq977BggFcYPV6Lwrh8Kme+X5kEFWo7RDu1vqa4aeinYp70j2ZK42RtCg5WwNlZm jF7fvpgzGQfjEfqtqtYk/Smxc55FiF1DzRJQljFdDTF+TAHDWRVE9dWx99Slz8SGgH3CU02MUAtOp iuDK8otwEodBnVvbaU4jNJWDdk0pwwUYh+8gpFJv1YEP6AedxhBMBK3IiweZW71V490ycF21qtuVn s7VGWPjQ==; Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:32c8:5054:ff:fe00:142]) by desiato.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1u1rh3-000000086gx-1xhj for linux-arm-kernel@lists.infradead.org; Mon, 07 Apr 2025 18:59:39 +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=xTONaCMGO+N+NO9JMd3j9lruIEiRtelFCdK2KAx5w+M=; b=hidQfRU5Rh4JiHeynMmBEAIf+H gzkvRXc9w95+J87NeqpP4x6NPTNpx+Q3uXkguxSQ11KGk5UGbqaoL98obnOMRMutn2185KmavdbPv 0YM45uW+cMvN8vfoCoeQWb6hOEEcRD2wL6LO4FvNpGx+OVfYdy20KHXY2LXbVxzane4Q5WZffWTGK NKfeCOci9TDgP+7oL8YTmvwSoVSGMzeYDG7+mE16BWaUfLvj8TUH/eg/WdFqUaxp90K/Q1H6PEj/N a+hsin3gVpPrUDpbMCc851uNyZ9OWoq58ia+NVZGpTA7wOuRjmPJzHkl916SsTpOHJ0yahzwBPWy7 1+BOv8bA==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:44378 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 1u1rgz-00069s-0v; Mon, 07 Apr 2025 19:59:33 +0100 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.94.2) (envelope-from ) id 1u1rgT-0013gp-97; Mon, 07 Apr 2025 19:59:01 +0100 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 , Jon Hunter , linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, Maxime Coquelin , netdev@vger.kernel.org, Paolo Abeni , Philipp Zabel , Richard Cochran , Thierry Reding Subject: [PATCH net-next 3/5] net: stmmac: intel-plat: remove eee_usecs_rate and hardware write MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Mon, 07 Apr 2025 19:59:01 +0100 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250407_195937_656567_2732A5D8 X-CRM114-Status: UNSURE ( 9.65 ) X-CRM114-Notice: Please train this message. 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 Remove the write to GMAC_1US_TIC_COUNTER for two reasons: 1. during initialisation or reinitialisation of the DWMAC core, the core is reset, which sets this register back to its default value. Writing it prior to stmmac_dvr_probe() has no effect. 2. Since commit 8efbdbfa9938 ("net: stmmac: Initialize MAC_ONEUS_TIC_COUNTER register"), GMAC4/5 core code will set this register based on the rate of plat->stmmac_clk. This clock is fetched by devm_stmmac_probe_config_dt(), and plat->clk_ptp_rate will be set to its rate profided a "ptp_ref" clock is not provided. In any case, Marek's commit will set the effectual value of this register. Therefore, dwmac-intel-plat.c writing GMAC_1US_TIC_COUNTER serves no useful purpose and can be removed. Signed-off-by: Russell King (Oracle) --- drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c index 599def7b3a64..4ea7b0a803d7 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c @@ -113,16 +113,7 @@ static int intel_eth_plat_probe(struct platform_device *pdev) plat_dat->clk_tx_i = dwmac->tx_clk; plat_dat->set_clk_tx_rate = stmmac_set_clk_tx_rate; - plat_dat->bsp_priv = dwmac; - plat_dat->eee_usecs_rate = plat_dat->clk_ptp_rate; - - if (plat_dat->eee_usecs_rate > 0) { - u32 tx_lpi_usec; - - tx_lpi_usec = (plat_dat->eee_usecs_rate / 1000000) - 1; - writel(tx_lpi_usec, stmmac_res.addr + GMAC_1US_TIC_COUNTER); - } ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); if (ret) From patchwork Mon Apr 7 18:59:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 14041868 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 181CFC369A4 for ; Mon, 7 Apr 2025 21:47:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Date: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-Owner; bh=6OUrCzCldOGuSSzB6HzeF4lCjN38tssC9VPeOMCVpQA=; b=zNLk5MV4texpPb9XkDK92sx6hS FUJyhG/gPBTSqQvCNiab9IaMBG+LqMnHP7g5dZ5nZxMhb05yLSkkILOCyi8HGpJn0P9c/Hbtv8Yl+ 3oqbyfC+W3Ag32D0hA87JPdvx8orgiVJ1jVXl4jOAkYsBcvyLOtzhx/utELTxPO4UzY6L30ZCvbjf zZHBJFBS8VmhcnIw5sJRZgpE0ryi2jwMtKAl1znyCZfc8UYXvcpdz/7iw68MEKFaUdl/xLp7LValO V7xn928m5dSXkTsbHksWQNKbfXepDTP8CcztJkJIhVKMEii/aVwnxgm0R6zs9ReFu5/i24+wwiH0c 7fRbIKiw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1u1uJ7-000000024Vx-0hYD; Mon, 07 Apr 2025 21:47:05 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1u1rhB-00000001j6r-30EA for linux-arm-kernel@bombadil.infradead.org; Mon, 07 Apr 2025 18:59:45 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; 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; bh=6OUrCzCldOGuSSzB6HzeF4lCjN38tssC9VPeOMCVpQA=; b=UC2EQTMoZXrFJ5bIRfgRdV9MSb 6pLPCihEwSslXGm3SgakUtEPvACRjRyRGz3WN5s9l7q7zlcAzeIcR/0GzevvYx7dzCsy/6U1eMOeC T7PAcLg047KPY3+kPS/lsKIP3bDhusq7jWumeHs46t493twCzYTsH0DfDrPGQC8FHY/6dq3FIjMgy GL6Pk8OZoCToqZ9J+c+Qg4OlXvcFTwl/xVsEeSVW+XtJVyrWkTR5Z3MNlauYbkEyK9BDNh+D69koK ldge2Ec1U8C0eloPI8HnWNWb2FLB4Jy/ix4sB7chImo2qH7xkM7uv4RvdZ3ie0bJ/vSE3DtyO8fSO QehZAXoA==; Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:32c8:5054:ff:fe00:142]) by desiato.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1u1rh7-000000086hm-46Ro for linux-arm-kernel@lists.infradead.org; Mon, 07 Apr 2025 18:59:44 +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=6OUrCzCldOGuSSzB6HzeF4lCjN38tssC9VPeOMCVpQA=; b=Ox9FUI/idEBlHs9dz8SvPkf/v8 sWb/15TPPiO7QJVwSf1HH0lBUGQqA2cgxJVXzwddGI07XLbaQiDnPMgiPliPfmIECeCZBcWPLpkPi 7zZlLxe2l8ag6/r0K6cuU5ElLX76rWN6qmpjpovkpsSiZFJhxXzcDXWbzLn+EpJ8IlNr5aMUL+h5W AF6cnwBKMuXAqd1AqEw02CBU9PBopD5EYgE7biRCdjF5+xEXNgRzk/TwNyjiU3jpOiJV7cc0pk6UB EVCVF7NNuXKXqWMPazYQGPAXrq9+A2LMPywE0EgiG7h9qX2KrRA1bqZ/sicmQqn+pHXJwCA9aadUV mRmZFYhA==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:44394 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 1u1rh4-0006AC-1K; Mon, 07 Apr 2025 19:59:38 +0100 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.94.2) (envelope-from ) id 1u1rgY-0013gv-CL; Mon, 07 Apr 2025 19:59:06 +0100 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 , Jon Hunter , linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, Maxime Coquelin , netdev@vger.kernel.org, Paolo Abeni , Philipp Zabel , Richard Cochran , Thierry Reding Subject: [PATCH net-next 4/5] net: stmmac: remove eee_usecs_rate MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Mon, 07 Apr 2025 19:59:06 +0100 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250407_195942_127736_7A1E93D2 X-CRM114-Status: UNSURE ( 9.04 ) X-CRM114-Notice: Please train this message. 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 plat_dat->eee_users_rate is now unused, so remove this member. Signed-off-by: Russell King (Oracle) --- include/linux/stmmac.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h index c4ec8bb8144e..8aed09d65b4a 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -276,7 +276,6 @@ struct plat_stmmacenet_data { int mac_port_sel_speed; int has_xgmac; u8 vlan_fail_q; - unsigned long eee_usecs_rate; struct pci_dev *pdev; int int_snapshot_num; int msi_mac_vec; From patchwork Mon Apr 7 18:59:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 14041869 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 BBBB7C36010 for ; Mon, 7 Apr 2025 21:47:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Date: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-Owner; bh=g+gTqjr9DCh74fm5MrIN8IfG63yVQfUMTpEsACnoz9g=; b=cGLFIFXvTKwK+qatuVpGRoGTjq +BRin3dxb/r6jzjetYcVsa82ojgDo6AuLpeZEpMIH5S612fdDS3OskcECd45ZH2m23YonpzAbNxre TfOEi3NAmwIGk4hTGBpSKgJN/o4VlxjZAQPHwxBSsWv9fFz1Vmg8cCicU4+7eT+UwzQLM+VXHhdtt ZtetypfwZh6Yrdho9O6v4Aieo7hWXV11l2XI/LCH0YN5A1zpsmANfgXAAo7sDQ2EieyzEaYe3lhaE tLrTUu6ls2wcfZvBGAT7Pw3xSnwHlkrtFvULTyKjud/mw0LLk7MWKQ1b6xiYRE6bVQwKG5ItxI6uI QIA4SPsw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1u1uJB-000000024eS-02gp; Mon, 07 Apr 2025 21:47:09 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1u1rhG-00000001j86-2545 for linux-arm-kernel@bombadil.infradead.org; Mon, 07 Apr 2025 18:59:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; 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; bh=g+gTqjr9DCh74fm5MrIN8IfG63yVQfUMTpEsACnoz9g=; b=S+9/lpDdDRdEMm/HJ3B2WEMXYp 3lTvAD1I5rsAmIiHjA8BHyJZYG2cxGITCkq/swCt+TlFSBth6dXpuQ2GFzFuu0FiXa9zvGbLWEsjQ wYHfAHeyCis5IrXimU2kYPf5KTfkwKLx8YJNNNjWpfTPt22A+kKzeGv/lPrf8IwAg7iM3BIRTFi0x b9T53bUVP3As9nGJxfDvDShJpiKumxTXkTCP5d9hMuOHrJTOTNvnFdlnuJ9pP7ekRWGWAbYaVeKj1 KJOeLl7nOZs//b/0WCJMlBz0PAJdti54O4gTDIijyfQKrsgaVV0F5OGqUI9IL5+ZSwGksXlXxWq9I /Aco7FvA==; Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:32c8:5054:ff:fe00:142]) by desiato.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1u1rhD-000000086ja-3RvQ for linux-arm-kernel@lists.infradead.org; Mon, 07 Apr 2025 18:59:49 +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=g+gTqjr9DCh74fm5MrIN8IfG63yVQfUMTpEsACnoz9g=; b=aSGIamiJukybih316LqvTsGTCU VJrvt/A8Zi349runxTQ69QaQi0QPBl4R2XSxcE7aIP+xD5O1s5Rwajkxo+EHErgJM5Iy63s2KUKmM 9bDd2+WP3srjq7mU2Lmxi9a57c6tQropXqxKy76NXPvRL4GWDKng97FpnMbZ7fhDeaAJq1se6+7AJ xLIYV42W3RV4xvEaXvdVpUyrEa8vs4MRHegTVntemDmTkXCAlwFRivqysD9KDJ7VYU6FL0Bkj8GzR WE0lGLkhEiq80lGjbyDZWRpTr+viXLhmvkbpZGECYwfVcH7+IpUBBjLMVT0C4ZCm9Rm/k+Ssudqnc F8zRG/Cw==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:43020 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 1u1rh9-0006AU-1k; Mon, 07 Apr 2025 19:59:43 +0100 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.94.2) (envelope-from ) id 1u1rgd-0013h1-Fz; Mon, 07 Apr 2025 19:59:11 +0100 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 , Jon Hunter , linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, Maxime Coquelin , netdev@vger.kernel.org, Paolo Abeni , Philipp Zabel , Richard Cochran , Thierry Reding Subject: [PATCH net-next 5/5] net: stmmac: remove GMAC_1US_TIC_COUNTER definition MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Mon, 07 Apr 2025 19:59:11 +0100 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250407_195947_939250_49E35C76 X-CRM114-Status: UNSURE ( 8.77 ) X-CRM114-Notice: Please train this message. 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 GMAC_1US_TIC_COUNTER is now no longer used, so remove the definition. This was duplicated by GMAC4_MAC_ONEUS_TIC_COUNTER further down in the same file. Signed-off-by: Russell King (Oracle) --- drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4.h b/drivers/net/ethernet/stmicro/stmmac/dwmac4.h index 42fe29a4e300..5f387ec27c8c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4.h +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4.h @@ -31,7 +31,6 @@ #define GMAC_RXQ_CTRL3 0x000000ac #define GMAC_INT_STATUS 0x000000b0 #define GMAC_INT_EN 0x000000b4 -#define GMAC_1US_TIC_COUNTER 0x000000dc #define GMAC_PCS_BASE 0x000000e0 #define GMAC_PHYIF_CONTROL_STATUS 0x000000f8 #define GMAC_PMT 0x000000c0