[PATCH v1 0/3] cleanup arc emac

[PATCH v1 0/3] cleanup arc emac

[Johan Jonker]

The Rockchip emac binding for rk3036/rk3066/rk3188 has been converted to YAML
with the ethernet-phy node in a mdio node. This requires some driver fixes
by someone that can do hardware testing.

In order to make a future fix easier make the driver 'Rockchip only'
by removing the obsolete part of the arc emac driver.

Johan Jonker (3):
  ARM: dts: rockchip: rk3xxx: fix emac node
  net: ethernet: arc: remove emac_arc driver
  dt-bindings: net: remove arc_emac.txt

 .../devicetree/bindings/net/arc_emac.txt      | 46 ----------
 arch/arm/boot/dts/rockchip/rk3066a.dtsi       |  4 -
 arch/arm/boot/dts/rockchip/rk3xxx.dtsi        |  7 +-
 drivers/net/ethernet/arc/Kconfig              | 10 ---
 drivers/net/ethernet/arc/Makefile             |  1 -
 drivers/net/ethernet/arc/emac_arc.c           | 88 -------------------
 6 files changed, 2 insertions(+), 154 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/net/arc_emac.txt
 delete mode 100644 drivers/net/ethernet/arc/emac_arc.c

--
2.39.2

[PATCH v1 1/3] ARM: dts: rockchip: rk3xxx: fix emac node

[Johan Jonker]

In the combined DT of rk3066a/rk3188 the emac node uses as place holder
the compatible string "snps,arc-emac". The last real user nSIM_700
of the "snps,arc-emac" compatible string in a driver was removed in 2019.
Rockchip emac nodes don't make use of this common fall back string.
In order to removed unused driver code replace this string with
"rockchip,rk3066-emac".
As we are there remove the blank lines and sort.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
---

[PATCH 8/8] ARC: nSIM_700: remove unused network options
https://lore.kernel.org/all/20191023124417.5770-9-Eugeniy.Paltsev@synopsys.com/
---
 arch/arm/boot/dts/rockchip/rk3066a.dtsi | 4 ----
 arch/arm/boot/dts/rockchip/rk3xxx.dtsi  | 7 ++-----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/arch/arm/boot/dts/rockchip/rk3066a.dtsi b/arch/arm/boot/dts/rockchip/rk3066a.dtsi
index 5e0750547ab5..3f6d49459734 100644
--- a/arch/arm/boot/dts/rockchip/rk3066a.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3066a.dtsi
@@ -896,7 +896,3 @@ &vpu {
 &wdt {
 	compatible = "rockchip,rk3066-wdt", "snps,dw-wdt";
 };
-
-&emac {
-	compatible = "rockchip,rk3066-emac";
-};
diff --git a/arch/arm/boot/dts/rockchip/rk3xxx.dtsi b/arch/arm/boot/dts/rockchip/rk3xxx.dtsi
index f37137f298d5..e6a78bcf9163 100644
--- a/arch/arm/boot/dts/rockchip/rk3xxx.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3xxx.dtsi
@@ -194,17 +194,14 @@ usb_host: usb@101c0000 {
 	};

 	emac: ethernet@10204000 {
-		compatible = "snps,arc-emac";
+		compatible = "rockchip,rk3066-emac";
 		reg = <0x10204000 0x3c>;
 		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
-
-		rockchip,grf = <&grf>;
-
 		clocks = <&cru HCLK_EMAC>, <&cru SCLK_MAC>;
 		clock-names = "hclk", "macref";
 		max-speed = <100>;
 		phy-mode = "rmii";
-
+		rockchip,grf = <&grf>;
 		status = "disabled";
 	};

--
2.39.2

Re: [PATCH v1 1/3] ARM: dts: rockchip: rk3xxx: fix emac node

[Heiko Stübner]

Am Dienstag, 18. Juni 2024, 18:13:56 CEST schrieb Johan Jonker:
> In the combined DT of rk3066a/rk3188 the emac node uses as place holder
> the compatible string "snps,arc-emac". The last real user nSIM_700
> of the "snps,arc-emac" compatible string in a driver was removed in 2019.
> Rockchip emac nodes don't make use of this common fall back string.
> In order to removed unused driver code replace this string with
> "rockchip,rk3066-emac".
> As we are there remove the blank lines and sort.
> 
> Signed-off-by: Johan Jonker <jbx6244@gmail.com>

Reviewed-by: Heiko Stuebner <heiko@sntech.de>

I think this is fine going through the network tree together with the
other two patches.


> ---
> 
> [PATCH 8/8] ARC: nSIM_700: remove unused network options
> https://lore.kernel.org/all/20191023124417.5770-9-Eugeniy.Paltsev@synopsys.com/
> ---
>  arch/arm/boot/dts/rockchip/rk3066a.dtsi | 4 ----
>  arch/arm/boot/dts/rockchip/rk3xxx.dtsi  | 7 ++-----
>  2 files changed, 2 insertions(+), 9 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/rockchip/rk3066a.dtsi b/arch/arm/boot/dts/rockchip/rk3066a.dtsi
> index 5e0750547ab5..3f6d49459734 100644
> --- a/arch/arm/boot/dts/rockchip/rk3066a.dtsi
> +++ b/arch/arm/boot/dts/rockchip/rk3066a.dtsi
> @@ -896,7 +896,3 @@ &vpu {
>  &wdt {
>  	compatible = "rockchip,rk3066-wdt", "snps,dw-wdt";
>  };
> -
> -&emac {
> -	compatible = "rockchip,rk3066-emac";
> -};
> diff --git a/arch/arm/boot/dts/rockchip/rk3xxx.dtsi b/arch/arm/boot/dts/rockchip/rk3xxx.dtsi
> index f37137f298d5..e6a78bcf9163 100644
> --- a/arch/arm/boot/dts/rockchip/rk3xxx.dtsi
> +++ b/arch/arm/boot/dts/rockchip/rk3xxx.dtsi
> @@ -194,17 +194,14 @@ usb_host: usb@101c0000 {
>  	};
> 
>  	emac: ethernet@10204000 {
> -		compatible = "snps,arc-emac";
> +		compatible = "rockchip,rk3066-emac";
>  		reg = <0x10204000 0x3c>;
>  		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
> -
> -		rockchip,grf = <&grf>;
> -
>  		clocks = <&cru HCLK_EMAC>, <&cru SCLK_MAC>;
>  		clock-names = "hclk", "macref";
>  		max-speed = <100>;
>  		phy-mode = "rmii";
> -
> +		rockchip,grf = <&grf>;
>  		status = "disabled";
>  	};
> 
> --
> 2.39.2
> 
> 

[PATCH v1 2/3] net: ethernet: arc: remove emac_arc driver

[Johan Jonker]

The last real user nSIM_700 of the "snps,arc-emac" compatible string in
a driver was removed in 2019. The use of this string in the combined DT of
rk3066a/rk3188 as place holder has also been replaced, so
remove emac_arc.c to clean up some code.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
---

[PATCH 8/8] ARC: nSIM_700: remove unused network options
https://lore.kernel.org/all/20191023124417.5770-9-Eugeniy.Paltsev@synopsys.com/
---
 drivers/net/ethernet/arc/Kconfig    | 10 ----
 drivers/net/ethernet/arc/Makefile   |  1 -
 drivers/net/ethernet/arc/emac_arc.c | 88 -----------------------------
 3 files changed, 99 deletions(-)
 delete mode 100644 drivers/net/ethernet/arc/emac_arc.c

diff --git a/drivers/net/ethernet/arc/Kconfig b/drivers/net/ethernet/arc/Kconfig
index 0a67612af228..0d400a7d8d91 100644
--- a/drivers/net/ethernet/arc/Kconfig
+++ b/drivers/net/ethernet/arc/Kconfig
@@ -23,16 +23,6 @@ config ARC_EMAC_CORE
 	select PHYLIB
 	select CRC32

-config ARC_EMAC
-	tristate "ARC EMAC support"
-	select ARC_EMAC_CORE
-	depends on OF_IRQ
-	depends on ARC || COMPILE_TEST
-	help
-	  On some legacy ARC (Synopsys) FPGA boards such as ARCAngel4/ML50x
-	  non-standard on-chip ethernet device ARC EMAC 10/100 is used.
-	  Say Y here if you have such a board.  If unsure, say N.
-
 config EMAC_ROCKCHIP
 	tristate "Rockchip EMAC support"
 	select ARC_EMAC_CORE
diff --git a/drivers/net/ethernet/arc/Makefile b/drivers/net/ethernet/arc/Makefile
index d63ada577c8e..23586eefec44 100644
--- a/drivers/net/ethernet/arc/Makefile
+++ b/drivers/net/ethernet/arc/Makefile
@@ -5,5 +5,4 @@

 arc_emac-objs := emac_main.o emac_mdio.o
 obj-$(CONFIG_ARC_EMAC_CORE) += arc_emac.o
-obj-$(CONFIG_ARC_EMAC) += emac_arc.o
 obj-$(CONFIG_EMAC_ROCKCHIP) += emac_rockchip.o
diff --git a/drivers/net/ethernet/arc/emac_arc.c b/drivers/net/ethernet/arc/emac_arc.c
deleted file mode 100644
index a3afddb23ee8..000000000000
--- a/drivers/net/ethernet/arc/emac_arc.c
+++ /dev/null
@@ -1,88 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/**
- * DOC: emac_arc.c - ARC EMAC specific glue layer
- *
- * Copyright (C) 2014 Romain Perier
- *
- * Romain Perier  <romain.perier@gmail.com>
- */
-
-#include <linux/etherdevice.h>
-#include <linux/module.h>
-#include <linux/of_net.h>
-#include <linux/platform_device.h>
-
-#include "emac.h"
-
-#define DRV_NAME    "emac_arc"
-
-static int emac_arc_probe(struct platform_device *pdev)
-{
-	struct device *dev = &pdev->dev;
-	struct arc_emac_priv *priv;
-	phy_interface_t interface;
-	struct net_device *ndev;
-	int err;
-
-	if (!dev->of_node)
-		return -ENODEV;
-
-	ndev = alloc_etherdev(sizeof(struct arc_emac_priv));
-	if (!ndev)
-		return -ENOMEM;
-	platform_set_drvdata(pdev, ndev);
-	SET_NETDEV_DEV(ndev, dev);
-
-	priv = netdev_priv(ndev);
-	priv->drv_name = DRV_NAME;
-
-	err = of_get_phy_mode(dev->of_node, &interface);
-	if (err) {
-		if (err == -ENODEV)
-			interface = PHY_INTERFACE_MODE_MII;
-		else
-			goto out_netdev;
-	}
-
-	priv->clk = devm_clk_get(dev, "hclk");
-	if (IS_ERR(priv->clk)) {
-		dev_err(dev, "failed to retrieve host clock from device tree\n");
-		err = -EINVAL;
-		goto out_netdev;
-	}
-
-	err = arc_emac_probe(ndev, interface);
-out_netdev:
-	if (err)
-		free_netdev(ndev);
-	return err;
-}
-
-static void emac_arc_remove(struct platform_device *pdev)
-{
-	struct net_device *ndev = platform_get_drvdata(pdev);
-
-	arc_emac_remove(ndev);
-	free_netdev(ndev);
-}
-
-static const struct of_device_id emac_arc_dt_ids[] = {
-	{ .compatible = "snps,arc-emac" },
-	{ /* Sentinel */ }
-};
-MODULE_DEVICE_TABLE(of, emac_arc_dt_ids);
-
-static struct platform_driver emac_arc_driver = {
-	.probe = emac_arc_probe,
-	.remove_new = emac_arc_remove,
-	.driver = {
-		.name = DRV_NAME,
-		.of_match_table  = emac_arc_dt_ids,
-	},
-};
-
-module_platform_driver(emac_arc_driver);
-
-MODULE_AUTHOR("Romain Perier <romain.perier@gmail.com>");
-MODULE_DESCRIPTION("ARC EMAC platform driver");
-MODULE_LICENSE("GPL");
--
2.39.2

Re: [PATCH v1 2/3] net: ethernet: arc: remove emac_arc driver

[Simon Horman]

On Tue, Jun 18, 2024 at 06:14:14PM +0200, Johan Jonker wrote:
> The last real user nSIM_700 of the "snps,arc-emac" compatible string in
> a driver was removed in 2019. The use of this string in the combined DT of
> rk3066a/rk3188 as place holder has also been replaced, so
> remove emac_arc.c to clean up some code.
> 
> Signed-off-by: Johan Jonker <jbx6244@gmail.com>

Reviewed-by: Simon Horman <horms@kernel.org>

Re: [PATCH v1 2/3] net: ethernet: arc: remove emac_arc driver

[Paolo Abeni]

On Tue, 2024-06-18 at 18:14 +0200, Johan Jonker wrote:
> The last real user nSIM_700 of the "snps,arc-emac" compatible string in
> a driver was removed in 2019. The use of this string in the combined DT of
> rk3066a/rk3188 as place holder has also been replaced, so
> remove emac_arc.c to clean up some code.
> 
> Signed-off-by: Johan Jonker <jbx6244@gmail.com>
> ---
> 
> [PATCH 8/8] ARC: nSIM_700: remove unused network options
> https://lore.kernel.org/all/20191023124417.5770-9-Eugeniy.Paltsev@synopsys.com/
> ---
>  drivers/net/ethernet/arc/Kconfig    | 10 ----
>  drivers/net/ethernet/arc/Makefile   |  1 -
>  drivers/net/ethernet/arc/emac_arc.c | 88 -----------------------------
>  3 files changed, 99 deletions(-)
>  delete mode 100644 drivers/net/ethernet/arc/emac_arc.c

AFAICS this depends on the previous DT patch, which in turn should go
via the arm tree.

Perhaps the whole series should go via the arm tree?

In such case:

Acked-by: Paolo Abeni <pabeni@redhat.com>

Re: [PATCH v1 2/3] net: ethernet: arc: remove emac_arc driver

[Jakub Kicinski]

On Thu, 20 Jun 2024 15:19:24 +0200 Paolo Abeni wrote:
> AFAICS this depends on the previous DT patch, which in turn should go
> via the arm tree.
> 
> Perhaps the whole series should go via the arm tree?

FWIW Heiko said on patch 1 that the whole thing should go via netdev...

Re: [PATCH v1 2/3] net: ethernet: arc: remove emac_arc driver

[Heiko Stübner]

Am Donnerstag, 20. Juni 2024, 15:37:29 CEST schrieb Jakub Kicinski:
> On Thu, 20 Jun 2024 15:19:24 +0200 Paolo Abeni wrote:
> > AFAICS this depends on the previous DT patch, which in turn should go
> > via the arm tree.
> > 
> > Perhaps the whole series should go via the arm tree?
> 
> FWIW Heiko said on patch 1 that the whole thing should go via netdev...

yep.

Reasoning is that the rk3066 is mostly inactive, so taking that dt-patch
through the net-tree won't create conflicts with other dt-changes here.

And of course both binding and driver changes are the bigger parts
of this series.

[PATCH v1 3/3] dt-bindings: net: remove arc_emac.txt

[Johan Jonker]

The last real user nSIM_700 of the "snps,arc-emac" compatible string in
a driver was removed in 2019. The use of this string in the combined DT of
rk3066a/rk3188 as place holder has also been replaced, so
remove arc_emac.txt

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
---

[PATCH 8/8] ARC: nSIM_700: remove unused network options
https://lore.kernel.org/all/20191023124417.5770-9-Eugeniy.Paltsev@synopsys.com/
---
 .../devicetree/bindings/net/arc_emac.txt      | 46 -------------------
 1 file changed, 46 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/net/arc_emac.txt

diff --git a/Documentation/devicetree/bindings/net/arc_emac.txt b/Documentation/devicetree/bindings/net/arc_emac.txt
deleted file mode 100644
index c73a0e9c625e..000000000000
--- a/Documentation/devicetree/bindings/net/arc_emac.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-* Synopsys ARC EMAC 10/100 Ethernet driver (EMAC)
-
-Required properties:
-- compatible: Should be "snps,arc-emac"
-- reg: Address and length of the register set for the device
-- interrupts: Should contain the EMAC interrupts
-- max-speed: see ethernet.txt file in the same directory.
-- phy: see ethernet.txt file in the same directory.
-
-Optional properties:
-- phy-reset-gpios : Should specify the gpio for phy reset
-- phy-reset-duration : Reset duration in milliseconds.  Should present
-  only if property "phy-reset-gpios" is available.  Missing the property
-  will have the duration be 1 millisecond.  Numbers greater than 1000 are
-  invalid and 1 millisecond will be used instead.
-
-Clock handling:
-The clock frequency is needed to calculate and set polling period of EMAC.
-It must be provided by one of:
-- clock-frequency: CPU frequency.
-- clocks: reference to the clock supplying the EMAC.
-
-Child nodes of the driver are the individual PHY devices connected to the
-MDIO bus. They must have a "reg" property given the PHY address on the MDIO bus.
-
-Examples:
-
-	ethernet@c0fc2000 {
-		compatible = "snps,arc-emac";
-		reg = <0xc0fc2000 0x3c>;
-		interrupts = <6>;
-		mac-address = [ 00 11 22 33 44 55 ];
-
-		clock-frequency = <80000000>;
-		/* or */
-		clocks = <&emac_clock>;
-
-		max-speed = <100>;
-		phy = <&phy0>;
-
-		#address-cells = <1>;
-		#size-cells = <0>;
-		phy0: ethernet-phy@0 {
-			reg = <1>;
-		};
-	};
--
2.39.2

Re: [PATCH v1 3/3] dt-bindings: net: remove arc_emac.txt

[Conor Dooley]

[-- Attachment #1: Type: text/plain, Size: 348 bytes --]

On Tue, Jun 18, 2024 at 06:14:32PM +0200, Johan Jonker wrote:
> The last real user nSIM_700 of the "snps,arc-emac" compatible string in
> a driver was removed in 2019. The use of this string in the combined DT of
> rk3066a/rk3188 as place holder has also been replaced, so
> remove arc_emac.txt

Acked-by: Conor Dooley <conor.dooley@microchip.com>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH v1 0/3] cleanup arc emac

[patchwork-bot+netdevbpf]

Hello:

This series was applied to netdev/net-next.git (main)
by David S. Miller <davem@davemloft.net>:

On Tue, 18 Jun 2024 18:11:49 +0200 you wrote:
> The Rockchip emac binding for rk3036/rk3066/rk3188 has been converted to YAML
> with the ethernet-phy node in a mdio node. This requires some driver fixes
> by someone that can do hardware testing.
> 
> In order to make a future fix easier make the driver 'Rockchip only'
> by removing the obsolete part of the arc emac driver.
> 
> [...]

Here is the summary with links:
  - [v1,1/3] ARM: dts: rockchip: rk3xxx: fix emac node
    (no matching commit)
  - [v1,2/3] net: ethernet: arc: remove emac_arc driver
    (no matching commit)
  - [v1,3/3] dt-bindings: net: remove arc_emac.txt
    https://git.kernel.org/netdev/net-next/c/8a3913c8e05b

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

Re: [PATCH v1 0/3] cleanup arc emac

[Jakub Kicinski]

On Fri, 21 Jun 2024 09:10:29 +0000 patchwork-bot+netdevbpf@kernel.org
wrote:
>   - [v1,1/3] ARM: dts: rockchip: rk3xxx: fix emac node
>     (no matching commit)
>   - [v1,2/3] net: ethernet: arc: remove emac_arc driver
>     (no matching commit)
>   - [v1,3/3] dt-bindings: net: remove arc_emac.txt
>     https://git.kernel.org/netdev/net-next/c/8a3913c8e05b

FTR - all of the patches were applied.