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: 14005309 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.forwardemail.net (smtp.forwardemail.net [121.127.44.59]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B4B8118BC26 for ; Thu, 6 Mar 2025 20:39:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=121.127.44.59 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741293554; cv=none; b=cw8HPGlQ4m1quunSVo2kph54NfKvz8o5juntb6hyL4Ox2Jb45UPrLMvBK7adr0UFcioSN0h2LI61v90X0oVUEfE3eyPzlVcExehuoqnL0iPLqgdMy6yZLY4RYm8C4aiH7BsCGcuv5uqM/IJ63kUevhRE6xh0vaKWDt8QRbCIeWs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741293554; c=relaxed/simple; bh=wduhX53R8HjEeAjnRW1KoaV39KQVKrQ6gif7EZPc4Mw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FyoBK03HvgSg2auKBkTk2ZzEhB6k3CITvRa/4WPLxFpjKN6+irzUlBMGs4HUsg/9pqprGBZoNOqh5ygjWdRB7dE49saNo6uf+BHO0iblLmKgCpbl/gg6xHfojR3erzNiRB1EwN8bOHqkqmq1IHlbnAoYevvvDKJnNCNqW3dIx6I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=kwiboo.se; spf=pass smtp.mailfrom=fe-bounces.kwiboo.se; dkim=pass (2048-bit key) header.d=kwiboo.se header.i=@kwiboo.se header.b=mrzCPSYp; arc=none smtp.client-ip=121.127.44.59 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=kwiboo.se Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fe-bounces.kwiboo.se Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kwiboo.se header.i=@kwiboo.se header.b="mrzCPSYp" 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=1741293549; bh=7JyxP8FBRDIO7vgzFTNLCIrseIO0xPkXO1N8Yvb5Wzo=; b=mrzCPSYp2vBoEgERGbhVXHiYhoFEygSIzdYjgLOIMzPYQRXFKwoRprf8SHOMlcEZjL0s8y5tb eflUW8t1NA/E7BZsAfHmYJk3nR+eEHZ+tetP3cVSemZQSZtyd77j/JwdkKolWS2vH9sfNuHffzi WMI241LU8bj5eFccdMtu0uBIP8RYGJXvsqGqdxG/rfGsTANWRaXLYRFYApZpLDLqlcWRT3IuwkC FLiq43rIrXCLzrfJyPjmGfp+Pw7g7oK7nsShu8dAbNtXZUwIFZzZ+wbBNduemgqM8QkXsZ7ZOZF 8EsDCbOe8+3vYu1+ziJ15mH8dapo7i0PKhAuVaJRjfVg== 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> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.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: 14005311 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.forwardemail.net (smtp.forwardemail.net [121.127.44.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 88FF12780F0 for ; Thu, 6 Mar 2025 20:39:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=121.127.44.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741293558; cv=none; b=sSTpgZikqKL1C/DxfkKPkNfHje+PKjLkxXozNoRRbE6WR0qnca9u9NyAo5XxQUX0LApMPyGm8BPadxseDvCKUyEG3u5d3QF3uoX+LV263mrYPAyVMzapIafz3XZtHt7+tZxCXBJ71T6H1HKNsmzUDJeZg3rTPey8NZivEfwvRfU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741293558; c=relaxed/simple; bh=9aoxFI2B+mD9My0HbvJ4N51Lsc7k7yX5fH7tkCyc4HU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Z//UEXto1GZk2MDgPsPVIL+I+faW4DjTpraFUZPjYdXft0TrGaWMEC3qGjluVZ6I3tDnuqd84qbGd5xW9c08mKCFLLvH61ILL9LxAv9N2v8rxjegKHUCYt9qItJWvx/E/Dgz7iS/vcnUATKGuHsvMUA9t204pusFNpSnhw4TCHA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=kwiboo.se; spf=pass smtp.mailfrom=fe-bounces.kwiboo.se; dkim=pass (2048-bit key) header.d=kwiboo.se header.i=@kwiboo.se header.b=ocIaY6br; arc=none smtp.client-ip=121.127.44.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=kwiboo.se Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fe-bounces.kwiboo.se Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kwiboo.se header.i=@kwiboo.se header.b="ocIaY6br" 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=1741293554; bh=YyDWZm/uji1wnOwzLL0mO19G3wOIsbkpkj7q10ooChs=; b=ocIaY6brCvyCWigrNCSntNZ278iUaEDFBNh1LKBp/NYTO/Wt7AMeiCvIKqr34lQPyYZIbw9Qj v+a0wtjH9eOx63STBt5hmRkP5Q2UP0jarbljnpKiQsHuS64KYKYdeCpKonf1/fG/GZe4jsv+SRv Xw6p/a5lmWzvI9a3LVsURypiKVymx3yBZ7+ktdTdcS0Ow+Klduswh5TEQo8a4TocduCt8vEzHxE 5mrWXh8yWUX2SsbqrMzysBcbDZU68Z/WaInN4/Tqe/xW9kfBbW05XwBxer4oy3YoKPiPQbpRREY c3kiwC1myykkYJ7kobyd3b8qFRyTG22yBEWeQSYiWK8w== 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> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.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: 14005312 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.forwardemail.net (smtp.forwardemail.net [149.28.215.223]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 44E4027426C for ; Thu, 6 Mar 2025 20:39:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=149.28.215.223 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741293563; cv=none; b=ZjpE1sCa01bsRmbA/OdfpE1SzJmdji3CW0KJPRg8PSQE/nSz8kUXWYbg9hsQViqe2D95Tr4nVCO4VytA+wDrhMmcOuQcaOT13A/hNISvXRUL+2FmPSkBoFXrQGY1HLSxwQxbtbm+nnfaEsBZX5PvmdHiL3clxPJW8nsqg0H+u1Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741293563; c=relaxed/simple; bh=3oyhS/neJz80BZOQqYNoBOpdxi5uNvHfAJDCokDJxVg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PJyBnKBQpHog/ZtwBq63iJBUH9sxt9O7tT3rsgw8pFAisAhebJH9r1qG5j5KcGGpF4E88Tm9xf29ucr1NMqRTgazQaeI5jKVVP8RQIoOhO+RUdYHyeLzzhQicHQYXhZr7n1j42H5MRZZFRNVG8pCS9cpyE7UJHIA/Xzy1x1FzEg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=kwiboo.se; spf=pass smtp.mailfrom=fe-bounces.kwiboo.se; dkim=pass (2048-bit key) header.d=kwiboo.se header.i=@kwiboo.se header.b=m0nMUEMd; arc=none smtp.client-ip=149.28.215.223 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=kwiboo.se Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fe-bounces.kwiboo.se Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kwiboo.se header.i=@kwiboo.se header.b="m0nMUEMd" 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=1741293561; bh=qK3GcAy1T7b7ZQP5vAw6ojWgGkMIfURsR+RxPTcGPYs=; b=m0nMUEMdasbqnujUuvlfygfdR5xDDGVGQ23tn3MP811H6BaX5/jlCsfIu7VZPaKP5QbTfPNfS 24UvBirCp8B5lnkyflf029a6W48J4aR8vIR6IGunub+uW3u60/rHRaWHoBixndazxD3VFOthxWz xMWR2t+pygkpCTiU2dGxDuBccrEUPtBrBGEij73k8XmlKtZl9PC/tCcJLK/kvHx8Wvk6g7DQrvo XCIsultszmcU13eGwCiKV9QTzIVTx4IGmFORKPHbV4XpQT8pwSGyEaezff/NUyZV2WAYjigJEJQ PjBV4ZBqZkGtJc8YLuY25plVdE3YgK1GR+rtsYKohOdw== 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> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.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) |