From patchwork Thu Mar 6 20:38:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 14005316 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 7EF0EC282D1 for ; Thu, 6 Mar 2025 20:41:04 +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:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=7JyxP8FBRDIO7vgzFTNLCIrseIO0xPkXO1N8Yvb5Wzo=; b=w/+evuLgEaazpo3oxTE22EpXkV +7g1Edhp+jBjRruKfkhDlIlya06ppixrO4IHdWInwpSBe9sgiA9K3oBZgLmpMN9qW9ntnoUnKJqt5 m/hMxm1nu/Aik2SzrnBllAzpJJtHqUUig7ayaOMFPslBxLj1SUvLPvXzKkci5lnr2bBfWL+RNV//3 Gg5oZ/bOhZF+1a3uF3zzcLvBPQ/yWnrIeGskWi1AogHE01qQlS9LGrA5BUQzyPx53x2GAPs4+uXSt nVpi1zTThKiTqFJ/bamC+el4XIHxS6t93H8ggZtX6g5C44gapKzhlPRvDhhUaJ5rzH3XSvWPmdsY4 zTS5HvvA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tqI1V-0000000C8xo-0oJO; Thu, 06 Mar 2025 20:40:53 +0000 Received: from smtp.forwardemail.net ([121.127.44.59]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tqHzs-0000000C8dY-06zc for linux-arm-kernel@lists.infradead.org; Thu, 06 Mar 2025 20:39:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=Content-Transfer-Encoding: MIME-Version: References: In-Reply-To: Message-ID: Date: Subject: Cc: To: From; q=dns/txt; s=fe-e1b5cab7be; t=1741293551; bh=7JyxP8FBRDIO7vgzFTNLCIrseIO0xPkXO1N8Yvb5Wzo=; b=IMwd2ph58mPQiONElVhaN1kGWelHLE/HsoQgQJOVELhIsafBOn3JS7Fxm9HyUb3Ysg0FCKUEl WX91+74IgVqnMvP9ucJd7Ab5rRST8RDny65NVjnTeaxw+kPgkUC3+41BHT4qth7XIm1x5ylyc1+ WvtDtUvyVhWNj/MtiM82WdqQSCVf5zK8puNpoF81HAAs2ora/gF2mn0bnEHfY3BqdZkIrcF4Kds Qewhd8VNpcjL3YOa6+JqsbYYUcsD4oLkEq9IK1ciTqnQhMWVz7gExV38pXrZkaU6pLpx4qKDegI 2dRdngDLQ059e0HuNskk/DayZpoix0yAICOaRgCxmJRw== X-Forward-Email-ID: 67ca07ecdeafcb1458af9261 X-Forward-Email-Sender: rfc822; jonas@kwiboo.se, smtp.forwardemail.net, 121.127.44.59 X-Forward-Email-Version: 0.4.40 X-Forward-Email-Website: https://forwardemail.net X-Complaints-To: abuse@forwardemail.net X-Report-Abuse: abuse@forwardemail.net X-Report-Abuse-To: abuse@forwardemail.net From: Jonas Karlman To: Heiko Stuebner , Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Alexandre Torgue , Wadim Egorov Cc: netdev@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Jonas Karlman , linux-stm32@st-md-mailman.stormreply.com Subject: [PATCH 1/3] net: stmmac: dwmac-rk: Use DELAY_ENABLE macro for RK3328 Date: Thu, 6 Mar 2025 20:38:52 +0000 Message-ID: <20250306203858.1677595-2-jonas@kwiboo.se> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250306203858.1677595-1-jonas@kwiboo.se> References: <20250306203858.1677595-1-jonas@kwiboo.se> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250306_123912_149744_DD4697EF X-CRM114-Status: GOOD ( 10.08 ) 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 Support for Rockchip RK3328 GMAC and addition of the DELAY_ENABLE macro was merged in the same merge window. This resulted in RK3328 not being converted to use the new DELAY_ENABLE macro. Change to use the DELAY_ENABLE macro to help disable MAC delay when RGMII_ID/RXID/TXID is used. Fixes: eaf70ad14cbb ("net: stmmac: dwmac-rk: Add handling for RGMII_ID/RXID/TXID") Signed-off-by: Jonas Karlman Reviewed-by: Dragan Simic --- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c index 003fa5cf42c3..297fa93e4a39 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -593,8 +593,7 @@ static void rk3328_set_to_rgmii(struct rk_priv_data *bsp_priv, regmap_write(bsp_priv->grf, RK3328_GRF_MAC_CON1, RK3328_GMAC_PHY_INTF_SEL_RGMII | RK3328_GMAC_RMII_MODE_CLR | - RK3328_GMAC_RXCLK_DLY_ENABLE | - RK3328_GMAC_TXCLK_DLY_ENABLE); + DELAY_ENABLE(RK3328, tx_delay, rx_delay)); regmap_write(bsp_priv->grf, RK3328_GRF_MAC_CON0, RK3328_GMAC_CLK_RX_DL_CFG(rx_delay) | From patchwork Thu Mar 6 20:38:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 14005318 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 3B53BC282D1 for ; Thu, 6 Mar 2025 20:44:20 +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:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=YyDWZm/uji1wnOwzLL0mO19G3wOIsbkpkj7q10ooChs=; b=e27dotnMzpq+5k00WkX5mn3dW/ jvb9oyYYz/Sz1bH73iGraqwfz4+AHfM5wR6MVV8WII+o0SipU22+1sgtCdWBjCohxReg0ElRx/v+b 30TprC9sZjhb+Mcv/ihU7EIN7PUclirat5KcB9DmRJnwuOitWVLckHkqwlzTlM8Ii9Oc14h2WeLYa QeBoPcTLLYLKpTpjHIc4FtwXQd2NVBr/j5kUyoou30eSylPr6IXswdFb/RDzH8Z0vmxRmv3RW2S8m B2MFO6S3kU13HHyYfAFUGDa2Cwqr7Swn/NRFYGKWWlrC2fCtnCgutSx4evS1klTGVt2aMJczP52h5 Fj+nV6sg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tqI4f-0000000C9LC-3xte; Thu, 06 Mar 2025 20:44:09 +0000 Received: from smtp.forwardemail.net ([121.127.44.73]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tqHzw-0000000C8ei-2ba1 for linux-arm-kernel@lists.infradead.org; Thu, 06 Mar 2025 20:39:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=Content-Transfer-Encoding: MIME-Version: References: In-Reply-To: Message-ID: Date: Subject: Cc: To: From; q=dns/txt; s=fe-e1b5cab7be; t=1741293555; bh=YyDWZm/uji1wnOwzLL0mO19G3wOIsbkpkj7q10ooChs=; b=0qj696Mys7I+j4bRWRd5PH3mdm3yo7WNIYutudch75jBkWqHLFRbb7BMUV/lIz5LsaMcQCDHr TDYEqEO3VU69aclPqhWMteXB7XhCSME4q83fL8mjWThsVBMfgX/NAXM6GabiSlK40imFT7WIb8r C8EWofbhnQimdV2E/Ew4Onf7SRqOftVgWf4saaO2A8DTujkMhWsQREhEO2ezcxQWYxm3pKhauxf 9OJtGOM6bjP6RLa9pSg8iuj8Kkhzj8Dn8xqc7TmI0mxqeMMqgzg/vI9FCFa13dV/f/q1HCE4s8w g5raOO6Lgtl31DpFMBpKmfRLtmDPA+S9b9eeedusBEdA== X-Forward-Email-ID: 67ca07f0deafcb1458af9276 X-Forward-Email-Sender: rfc822; jonas@kwiboo.se, smtp.forwardemail.net, 121.127.44.73 X-Forward-Email-Version: 0.4.40 X-Forward-Email-Website: https://forwardemail.net X-Complaints-To: abuse@forwardemail.net X-Report-Abuse: abuse@forwardemail.net X-Report-Abuse-To: abuse@forwardemail.net From: Jonas Karlman To: Heiko Stuebner , Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Alexandre Torgue , Ezequiel Garcia , David Wu Cc: netdev@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Jonas Karlman , linux-stm32@st-md-mailman.stormreply.com Subject: [PATCH 2/3] net: stmmac: dwmac-rk: Use DELAY_ENABLE macro for RK3566/RK3568 Date: Thu, 6 Mar 2025 20:38:53 +0000 Message-ID: <20250306203858.1677595-3-jonas@kwiboo.se> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250306203858.1677595-1-jonas@kwiboo.se> References: <20250306203858.1677595-1-jonas@kwiboo.se> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250306_123916_762248_436C40F3 X-CRM114-Status: UNSURE ( 9.72 ) 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 Support for Rockchip RK3566/RK3568 GMAC was added without use of the DELAY_ENABLE macro to assist with enable/disable use of MAC rx/tx delay. Change to use the DELAY_ENABLE macro to help disable MAC delay when RGMII_ID/RXID/TXID is used. This also re-order to enable/disable before the delay is written to match all other GMAC and vendor kernel. Fixes: 3bb3d6b1c195 ("net: stmmac: Add RK3566/RK3568 SoC support") Signed-off-by: Jonas Karlman Reviewed-by: Dragan Simic --- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c index 297fa93e4a39..37eb86e4e325 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -1049,14 +1049,13 @@ static void rk3568_set_to_rgmii(struct rk_priv_data *bsp_priv, con1 = (bsp_priv->id == 1) ? RK3568_GRF_GMAC1_CON1 : RK3568_GRF_GMAC0_CON1; + regmap_write(bsp_priv->grf, con1, + RK3568_GMAC_PHY_INTF_SEL_RGMII | + DELAY_ENABLE(RK3568, tx_delay, rx_delay)); + regmap_write(bsp_priv->grf, con0, RK3568_GMAC_CLK_RX_DL_CFG(rx_delay) | RK3568_GMAC_CLK_TX_DL_CFG(tx_delay)); - - regmap_write(bsp_priv->grf, con1, - RK3568_GMAC_PHY_INTF_SEL_RGMII | - RK3568_GMAC_RXCLK_DLY_ENABLE | - RK3568_GMAC_TXCLK_DLY_ENABLE); } static void rk3568_set_to_rmii(struct rk_priv_data *bsp_priv) From patchwork Thu Mar 6 20:38:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 14005325 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 1E97AC282DE for ; Thu, 6 Mar 2025 20:45:58 +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:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=qK3GcAy1T7b7ZQP5vAw6ojWgGkMIfURsR+RxPTcGPYs=; b=bV7O3S/oJ3A6UMXAx4m2KMVE86 171NJEHW4WbdUVWRDldmjpvkhPll5K9lEJihHaj3tO23wagq08DZILFwJqDYeDun4p6PviEkko89+ I6RhCMmuJowC4gs5qOHGq/Qh339f5d2HtKwwgeE7hiBcRlWamsKcFnaB0ROYsFaTeaXz7UBLE2eQ4 t8ag5H5AcX5uxvz3hdEoDU9pFVA36pUxxQls98sLrDnECLfa2KR6z9Q+AAEBP4xPd/u2OqNC7t9sR su3RiKX+BzJIQMK2xz7yUNolfev1hzQYQ5QVwFlDenzoIEi8ck47ibKJP3xl1FoSmB92TNNQXjlOF b//uIV2Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tqI6G-0000000C9b4-2GXd; Thu, 06 Mar 2025 20:45:48 +0000 Received: from smtp.forwardemail.net ([149.28.215.223]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tqI06-0000000C8hb-1D5U for linux-arm-kernel@lists.infradead.org; Thu, 06 Mar 2025 20:39:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=Content-Transfer-Encoding: MIME-Version: References: In-Reply-To: Message-ID: Date: Subject: Cc: To: From; q=dns/txt; s=fe-e1b5cab7be; t=1741293565; bh=qK3GcAy1T7b7ZQP5vAw6ojWgGkMIfURsR+RxPTcGPYs=; b=dOpCFaE/HW4BZDw1+wRTcslAyYkItZ2SiABmkq8gQbdq+TMawFaQQa9N76Q8RKxp5el2gVQcm vgsJzIguqLC0TRhVkTrrHvRlyzblsIXDt9+F2WRLS29wCzxMk66qRXhhHMJgcSoZgGRDllAxK01 lBiq6OqGhiOH+Jw0D+unYM4PdopI068488wvm8kUBWTKsEUGc8fViVGtTDKKC11YIeoW6Hufbfq fvArE+nVDTno8YrngLTfe2S5G8Wetg9pn0kq4P0rwix6eyqK5sTAWUe7UyUB4dT0Y6CuFj0YP+/ dBx6FW+C8nIRbMncmEqmdqm/b4MzTQ/XUIMioChSD5Ww== X-Forward-Email-ID: 67ca07f4deafcb1458af928b X-Forward-Email-Sender: rfc822; jonas@kwiboo.se, smtp.forwardemail.net, 149.28.215.223 X-Forward-Email-Version: 0.4.40 X-Forward-Email-Website: https://forwardemail.net X-Complaints-To: abuse@forwardemail.net X-Report-Abuse: abuse@forwardemail.net X-Report-Abuse-To: abuse@forwardemail.net From: Jonas Karlman To: Heiko Stuebner , Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Alexandre Torgue , David Wu , Sebastian Reichel Cc: netdev@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Jonas Karlman , linux-stm32@st-md-mailman.stormreply.com Subject: [PATCH 3/3] net: stmmac: dwmac-rk: Use DELAY_ENABLE macro for RK3588 Date: Thu, 6 Mar 2025 20:38:54 +0000 Message-ID: <20250306203858.1677595-4-jonas@kwiboo.se> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250306203858.1677595-1-jonas@kwiboo.se> References: <20250306203858.1677595-1-jonas@kwiboo.se> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250306_123926_354267_0E3ED6D6 X-CRM114-Status: GOOD ( 10.27 ) 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 Support for Rockchip RK3588 GMAC was added without use of the DELAY_ENABLE macro to assist with enable/disable use of MAC rx/tx delay. Change to use a variant of the DELAY_ENABLE macro to help disable MAC delay when RGMII_ID/RXID/TXID is used. Fixes: 2f2b60a0ec28 ("net: ethernet: stmmac: dwmac-rk: Add gmac support for rk3588") Signed-off-by: Jonas Karlman Reviewed-by: Dragan Simic Reviewed-by: Sebastian Reichel --- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c index 37eb86e4e325..79db81d68afd 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -91,6 +91,10 @@ struct rk_priv_data { (((tx) ? soc##_GMAC_TXCLK_DLY_ENABLE : soc##_GMAC_TXCLK_DLY_DISABLE) | \ ((rx) ? soc##_GMAC_RXCLK_DLY_ENABLE : soc##_GMAC_RXCLK_DLY_DISABLE)) +#define DELAY_ENABLE_BY_ID(soc, tx, rx, id) \ + (((tx) ? soc##_GMAC_TXCLK_DLY_ENABLE(id) : soc##_GMAC_TXCLK_DLY_DISABLE(id)) | \ + ((rx) ? soc##_GMAC_RXCLK_DLY_ENABLE(id) : soc##_GMAC_RXCLK_DLY_DISABLE(id))) + #define PX30_GRF_GMAC_CON1 0x0904 /* PX30_GRF_GMAC_CON1 */ @@ -1322,8 +1326,7 @@ static void rk3588_set_to_rgmii(struct rk_priv_data *bsp_priv, RK3588_GMAC_CLK_RGMII_MODE(id)); regmap_write(bsp_priv->grf, RK3588_GRF_GMAC_CON7, - RK3588_GMAC_RXCLK_DLY_ENABLE(id) | - RK3588_GMAC_TXCLK_DLY_ENABLE(id)); + DELAY_ENABLE_BY_ID(RK3588, tx_delay, rx_delay, id)); regmap_write(bsp_priv->grf, offset_con, RK3588_GMAC_CLK_RX_DL_CFG(rx_delay) |