From nobody Sat Feb 7 22:55:12 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 411922BE622; Mon, 29 Dec 2025 19:17:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767035872; cv=none; b=brxGvuTfBsbX5mKOPFUmjyP+z0uVAeU8Sob191narQObUI4yOnit49rKDDb8vYSmSmKPBsxO70tYJllmf8LGryTv++JMiRL0a4J5FiXXPj6C/amnPiSm1FBbI1b5JqhAUoz9Iop/GYVuUXqLeYFH15761p5kXcg8HmhKDOr6U/Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767035872; c=relaxed/simple; bh=P4TDnNk14F9PHiB/aO/B1Q6sB0FOFxIs5TdMoRAoLHs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jvLBUD9S+GTBYfWghuDdUuGPRB6bCu4IRykIJjBYeBCKDke7KTdN4opm73nHvZI8R62HLkk0SO5N+BjQ7gyxRPi0HlCaNQssDwvuZf8ThXLS3hraowkDg3sQBNwxpyogf3GgknktNI+snXO2uJQ4R7kdLDL6EzQtsiEjiW+SSVY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CkLAQgp8; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="CkLAQgp8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 63C83C19423; Mon, 29 Dec 2025 19:17:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767035871; bh=P4TDnNk14F9PHiB/aO/B1Q6sB0FOFxIs5TdMoRAoLHs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=CkLAQgp8JVSDw+levfEh/+99v/n5tBInf8dxR1N1QqBnNaydcPDsXEJBfHxcYBqb/ Gea9WKt0+bKw4JLmSUIw7VgvGawkg5SkpgBIr1xR+FZn2zKdz9Bq2Obq5ZAfk02pac Qau/Kfzr65vdkKVjkz+M3tu35gaTAY9nMH9g7klWinh9P1fzyAOj40KaTiB7QT5wTM o3B8xjcKNL2BUXzLMiR/+mgrTvqJ8+Ysccntso6IzbwLKuZv8rz9gAPxyJtu/mHPGT 2cpPDUl5p0xEpmcA3lF3qjninqMZ6j+tPoGaj2yE/0I26X8jgE72KDTawCj1qNEMAP 7dIb08vj/JXtA== From: Dinh Nguyen Date: Mon, 29 Dec 2025 13:17:18 -0600 Subject: [PATCH 1/2] net: stmmac: socfpga: add call to assert/deassert ahb reset line Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251229-remove_ocp-v1-1-594294e04bd4@kernel.org> References: <20251229-remove_ocp-v1-0-594294e04bd4@kernel.org> In-Reply-To: <20251229-remove_ocp-v1-0-594294e04bd4@kernel.org> To: Maxime Chevallier , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Alexandre Torgue , Philipp Zabel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Mamta Shukla , Ahmad Fatoum Cc: bsp-development.geo@leica-geosystems.com, Pengutronix Kernel Team , netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Dinh Nguyen X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2818; i=dinguyen@kernel.org; h=from:subject:message-id; bh=P4TDnNk14F9PHiB/aO/B1Q6sB0FOFxIs5TdMoRAoLHs=; b=owEBbQKS/ZANAwAKARmUBAuBoyj0AcsmYgBpUtPbqXk/Yw9UdSOyLmXm8ZWv+eUnK6pQDTyNC YUmv9imar+JAjMEAAEKAB0WIQSgeEx6LKTlWbBUzA0ZlAQLgaMo9AUCaVLT2wAKCRAZlAQLgaMo 9KK8D/4hqNU4cTNOQyotM99zfD/zz6svCjL5f6T681rTo5pnz3KekYAqQ03O4Gqku+Nm1bm22S+ U3IeyArqIgmpIX78aVOAoX9Bju4JDAoqYjDraM+TGOl+6SOK6GcJK3hvo61kqO1RIPaNjcYr4WU 6B4LgkKsnv6uUTDkUopFo5O0NTyEFU+V7Gy5/Ip8rEj+PjD4EK4GCIyBz9GiHJr60smcjgxwIoD nChCAWPNLC8RFPDRIEBx7dC6soR2P8CcQ0VRQIO/EcbIfXXSAn0VIOSyPRQZB0xxktqJmrwJqW3 UT10/+2qabmUdFwtkfWfNXyB3tAfevCTReMxe2Y5u1BrAWBMVEQ4ookLfZAaWV0X5HgNHxq5B3B ixORAJvYFo37xOMeD1LPe6RQHWAcmddoL+K8ATLyNswy3a/YqTIupgbQPjjM44SjSbQJOde1dqq dVYF/k822pbL508qO49HzfcSjRwky7MIJIRoVVRroWXF1RJ8BpbpJ1ZUvdJStsNltCPi/Rne8N/ BfVDuJ8LVIp9Un2s2IcIGTEzYnCNh/i8aqnibK5PTtENys6Qsx+Mkd1krDdfvUFuGlnpHBwX6gs AwqCF5cUDhsUZanfiaYa2dxS66CW2bDNVqTFnWq2VNNiJms5TSfw7DipX+lmLoZccBecNogITvu K/QLZmcl69LU0Gw== X-Developer-Key: i=dinguyen@kernel.org; a=openpgp; fpr=A0784C7A2CA4E559B054CC0D1994040B81A328F4 The "stmmaceth-ocp" reset line of stmmac controller on the SoCFPGA platform is essentially the "ahb" reset on the standard stmmac controller. But since stmmaceth-ocp has already been introduced into the wild, we cannot just remove support for it. But what we can do is to support both "stmmaceth-ocp" and "ahb" reset names. Going forward we will be using "ahb", but in order to not break ABI, we will be call reset assert/de-assert both ahb and stmmaceth-ocp. The ethernet hardware on SoCFPGA requires either the stmmaceth-ocp or ahb reset to be asserted every time before changing the phy mode, then de-asserted when the phy mode has been set. With this change, we should be able to revert patch: commit 62a40a0d5634 ("arm: dts: socfpga: use reset-name "stmmaceth-ocp" instead of "ahb"") Signed-off-by: Dinh Nguyen --- drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c b/drivers/= net/ethernet/stmicro/stmmac/dwmac-socfpga.c index a2b52d2c4eb6..79df55515c71 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c @@ -407,6 +407,7 @@ static int socfpga_gen5_set_phy_mode(struct socfpga_dwm= ac *dwmac) =20 /* Assert reset to the enet controller before changing the phy mode */ reset_control_assert(dwmac->stmmac_ocp_rst); + reset_control_assert(dwmac->plat_dat->stmmac_ahb_rst); reset_control_assert(dwmac->stmmac_rst); =20 regmap_read(sys_mgr_base_addr, reg_offset, &ctrl); @@ -436,6 +437,7 @@ static int socfpga_gen5_set_phy_mode(struct socfpga_dwm= ac *dwmac) * the enet controller, and operation to start in requested mode */ reset_control_deassert(dwmac->stmmac_ocp_rst); + reset_control_deassert(dwmac->plat_dat->stmmac_ahb_rst); reset_control_deassert(dwmac->stmmac_rst); if (phymode =3D=3D PHY_INTERFACE_MODE_SGMII) socfpga_sgmii_config(dwmac, true); @@ -463,6 +465,7 @@ static int socfpga_gen10_set_phy_mode(struct socfpga_dw= mac *dwmac) =20 /* Assert reset to the enet controller before changing the phy mode */ reset_control_assert(dwmac->stmmac_ocp_rst); + reset_control_assert(dwmac->plat_dat->stmmac_ahb_rst); reset_control_assert(dwmac->stmmac_rst); =20 regmap_read(sys_mgr_base_addr, reg_offset, &ctrl); @@ -489,6 +492,7 @@ static int socfpga_gen10_set_phy_mode(struct socfpga_dw= mac *dwmac) * the enet controller, and operation to start in requested mode */ reset_control_deassert(dwmac->stmmac_ocp_rst); + reset_control_deassert(dwmac->plat_dat->stmmac_ahb_rst); reset_control_deassert(dwmac->stmmac_rst); if (phymode =3D=3D PHY_INTERFACE_MODE_SGMII) socfpga_sgmii_config(dwmac, true); --=20 2.42.0.411.g813d9a9188 From nobody Sat Feb 7 22:55:12 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 A95832C0F7B; Mon, 29 Dec 2025 19:17:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767035873; cv=none; b=QEsQ0yOGqYAyTGYjBgHGMNEvnM6sZ4kVmXof/9z3DmQkEU4EqEIt3G0dAddgCvnrKGkL9G5aAQoK7aiWLFRrFQmG4rsOwlqQGu2Ymb5wGEnNYB7r5OMHk/cO1MXMldlLAGEGtIFQx4Wx4ZklwCF1mDeiUyaSUtyDJ6FM7+qltMo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767035873; c=relaxed/simple; bh=d2TRHYORZXsy2A1NvCNofvbS7eDma5sCMXLSKryxZ+A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hZumIZ9IqGK6F5+n9BuF4bC9L9R2M5R2fhIrW0aIGFpM4aM+9YQwl2JV/S5IRN4nhI0Usdew8rjGrB1h6mePWkFTKt3uxCSEPWDUAjuA3pewwFM/hRGJFCG30VlWyp2wNewPXErn9nBZvzSSCkeWNJtcxoJuUFiWbYbH/2YfTF4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hbAzqKEZ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hbAzqKEZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EA8F1C4CEF7; Mon, 29 Dec 2025 19:17:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767035873; bh=d2TRHYORZXsy2A1NvCNofvbS7eDma5sCMXLSKryxZ+A=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=hbAzqKEZmOT4OAvGjay6ZbKxfEn89vFk6+M+/mrBS95qYTDFYK6teKSpepbtbDVhB zVXaWcqu8M/VicJWW81BU0DhomB4O89rfl91yekn8Sd4aHeZLh1lAqdIXm3W4czws6 bKs11DMTutMn5CWlVIk2rYic1zabSCi4UVuhtROByqkED1kK9jdCYbjbgflZTKzeRE 5REfAeRWGXVrAriI6asDhF59r/DM1zwjOyAbOEtqtWEsmKkivYmBW2eLrSMSvT+GTM W1IlAnfSamIwk9sqANNok68HO6uzO/lVgGLgLPKspXX7NCfsu752o5Q/tP4l62R66y F8+j0fB+S84Ng== From: Dinh Nguyen Date: Mon, 29 Dec 2025 13:17:19 -0600 Subject: [PATCH 2/2] Revert "arm: dts: socfpga: use reset-name "stmmaceth-ocp" instead of "ahb"" Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251229-remove_ocp-v1-2-594294e04bd4@kernel.org> References: <20251229-remove_ocp-v1-0-594294e04bd4@kernel.org> In-Reply-To: <20251229-remove_ocp-v1-0-594294e04bd4@kernel.org> To: Maxime Chevallier , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Alexandre Torgue , Philipp Zabel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Mamta Shukla , Ahmad Fatoum Cc: bsp-development.geo@leica-geosystems.com, Pengutronix Kernel Team , netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Dinh Nguyen X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1818; i=dinguyen@kernel.org; h=from:subject:message-id; bh=d2TRHYORZXsy2A1NvCNofvbS7eDma5sCMXLSKryxZ+A=; b=owEBbQKS/ZANAwAKARmUBAuBoyj0AcsmYgBpUtPcHIcFizytq0dGZkNW22rpAEY2qpU74OH1O vbi6hJ2X7eJAjMEAAEKAB0WIQSgeEx6LKTlWbBUzA0ZlAQLgaMo9AUCaVLT3AAKCRAZlAQLgaMo 9FG2D/9jgiEwhyxfOr5Mo/+NnTLWSreSDld5RyR7AHNijUW/gR6BWUBKC1AHObHTYPrGVx4EIFf CJUPAZAzCSbL7Q9WViMlHQH4JQcyHA6kEOdiPMlFbqjuppjhr449jsqofenGJFm/gC3JT30vYPy 8LyhPX1b7P4mMX7ySrXDVJx4B5RGB9Sy7Cv2175rjrgLV1CRpvzxdTVE+bU9/IpFa6sBMhBf0sB 7qDwsSmc2vYHBWecOjM1CfQ0RGTecYFrnXzleh8jrZM3xJqDkr5o3wqG1SmYadsiukMQX6tRfTG eagGt829RmEzvNIO1mu2CQdsx34EdwcAclUW+h+AUUShShSlpbtlotxxjziaikFRHeQ/szfeLlW Z3d9IFkMSOcy3Yom13452NSZajaL1gV85ijQk+3yu7dznepFMvyso4iIkYB/zj9lq9dH1S3KK3x MURAtDLL+o1zvT/gwOusDI49QcziwRWaxjkabzuNxMujPGVHi9slExTjdOhL58gmBiPrGvk7Vmj yxzo7dmotSivdQ0KQnFKRlEFMBN8N+Gs1ASuYmFwTFSwpC6I/jzxxTy6JvXj/zvSP7pXb8pzxvp cZ3Ej7YqYzzecHH+lBIHAuS3+No+VvQP7UpBXdV4V7paWM4XpTMODhqmYppkELZVWfqatiIG9GU MWd8Sx8Kg4lRuHQ== X-Developer-Key: i=dinguyen@kernel.org; a=openpgp; fpr=A0784C7A2CA4E559B054CC0D1994040B81A328F4 This reverts commit 62a40a0d5634834790f7166ab592be247390d857. With the patch "add call to assert/deassert ahb reset line" in place, we can safely remove the "stmmaceth-ocp" reset name and just use the standard "ahb" reset name. Signed-off-by: Dinh Nguyen --- arch/arm/boot/dts/intel/socfpga/socfpga_arria10.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/intel/socfpga/socfpga_arria10.dtsi b/arch/ar= m/boot/dts/intel/socfpga/socfpga_arria10.dtsi index b108265e9bde..6b6e77596ffa 100644 --- a/arch/arm/boot/dts/intel/socfpga/socfpga_arria10.dtsi +++ b/arch/arm/boot/dts/intel/socfpga/socfpga_arria10.dtsi @@ -440,7 +440,7 @@ gmac0: ethernet@ff800000 { clocks =3D <&l4_mp_clk>, <&peri_emac_ptp_clk>; clock-names =3D "stmmaceth", "ptp_ref"; resets =3D <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>; - reset-names =3D "stmmaceth", "stmmaceth-ocp"; + reset-names =3D "stmmaceth", "ahb"; snps,axi-config =3D <&socfpga_axi_setup>; status =3D "disabled"; }; @@ -460,7 +460,7 @@ gmac1: ethernet@ff802000 { clocks =3D <&l4_mp_clk>, <&peri_emac_ptp_clk>; clock-names =3D "stmmaceth", "ptp_ref"; resets =3D <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>; - reset-names =3D "stmmaceth", "stmmaceth-ocp"; + reset-names =3D "stmmaceth", "ahb"; snps,axi-config =3D <&socfpga_axi_setup>; status =3D "disabled"; }; @@ -480,7 +480,7 @@ gmac2: ethernet@ff804000 { clocks =3D <&l4_mp_clk>, <&peri_emac_ptp_clk>; clock-names =3D "stmmaceth", "ptp_ref"; resets =3D <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>; - reset-names =3D "stmmaceth", "stmmaceth-ocp"; + reset-names =3D "stmmaceth", "ahb"; snps,axi-config =3D <&socfpga_axi_setup>; status =3D "disabled"; }; --=20 2.42.0.411.g813d9a9188