Skip to contentSkip to conversation

sun8i: r40: second ethernet support

PATCH Superseded Evgeny Boger 3 participants 7 messages Mar 9, 2021 – Mar 10, 2021

Subsystems (3)

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

v2 cover sun8i: r40: second ethernet support

This patch series adds support for two Ethernet ports on Allwinner R40.

R40 (aka V40,A40i,T3) has two different Ethernet IPs called EMAC and GMAC. EMAC only support 10/100 Mbit in MII mode, while GMAC support both 10/100 (MII) and 10/100/1000 (RGMII).

In contrast to A10/A20 where GMAC and EMAC share the same pins making EMAC somewhat pointless, on R40 EMAC can be routed to port H.
Both EMAC (on port H) and GMAC (on port A) can be then enabled at the same time, allowing for two ethernet ports.

Tested on custom A40i board with two IP101GRI PHYs in MII mode.

Changes in v2:
- EMAC reset is no longer optional on R40
- Add a new DT compatible string for R40 EMAC
- Deassert reset line before enabling the clock
- minor fixes: formatting, DT node order, leftover pinctrl props

Evgeny Boger (2):
net: allwinner: reset control support
dts: r40: add second ethernet support

 .../net/allwinner,sun4i-a10-emac.yaml         | 11 +++-
 arch/arm/boot/dts/sun8i-r40.dtsi              | 59 +++++++++++++++++
 drivers/net/ethernet/allwinner/sun4i-emac.c   | 65 +++++++++++++++++--
 3 files changed, 129 insertions(+), 6 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 1/2 net: allwinner: reset control support

R40 (aka V40/A40i/T3) and A10/A20 share the same EMAC IP. However, on R40 the EMAC is gated by default.

---
 .../net/allwinner,sun4i-a10-emac.yaml         | 11 +++-
 drivers/net/ethernet/allwinner/sun4i-emac.c   | 65 +++++++++++++++++--
 2 files changed, 70 insertions(+), 6 deletions(-)
Documentation/devicetree/bindings/net/allwinner,sun4i-a10-emac.yaml +10 -1
index 8d8560a67abf..27f99372d153 100644
@@ -15,7 +15,12 @@ maintainers:
 
 properties:
   compatible:
-    const: allwinner,sun4i-a10-emac
+    oneOf:
+      - const: allwinner,sun4i-a10-emac
+      - const: allwinner,sun4i-r40-emac
+      - items:
+          - const: allwinner,sun4i-r40-emac
+          - const: allwinner,sun4i-a10-emac
 
   reg:
     maxItems: 1
@@ -30,6 +35,9 @@ properties:
     description: Phandle to the device SRAM
     $ref: /schemas/types.yaml#/definitions/phandle-array
 
+  resets:
+    maxItems: 1
+
 required:
   - compatible
   - reg
@@ -47,6 +55,7 @@ examples:
         reg = <0x01c0b000 0x1000>;
         interrupts = <55>;
         clocks = <&ahb_gates 17>;
+        resets = <&ccu RST_BUS_EMAC>;
         phy-handle = <&phy0>;
         allwinner,sram = <&emac_sram 1>;
     };
drivers/net/ethernet/allwinner/sun4i-emac.c +60 -5

135 lines not on this page · raw message

Signature · 1 line
2.17.1
maintainer
#2 lore raw

Re: [PATCH v2 1/2] net: allwinner: reset control support

Quoted 9 lines · Evgeny Boger

R40 (aka V40/A40i/T3) and A10/A20 share the same EMAC IP. However, on R40 the EMAC is gated by default.

---
 .../net/allwinner,sun4i-a10-emac.yaml         | 11 +++-
 drivers/net/ethernet/allwinner/sun4i-emac.c   | 65 +++++++++++++++++--
 2 files changed, 70 insertions(+), 6 deletions(-)

My bot found errors running 'make dt_binding_check' on your patch:

yamllint warnings/errors:

dtschema/dtc warnings/errors:
Error: Documentation/devicetree/bindings/net/allwinner,sun4i-a10-emac.example.dts:24.28-29 syntax error FATAL ERROR: Unable to parse input tree
make[1]: *** [scripts/Makefile.lib:349: Documentation/devicetree/bindings/net/allwinner,sun4i-a10-emac.example.dt.yaml] Error 1
make: *** [Makefile:1380: dt_binding_check] Error 2

See https://patchwork.ozlabs.org/patch/1449498

This check can fail if there are any dependencies. The base for a patch series is generally the most recent rc1.

If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date:

pip3 install dtschema --upgrade

Please check and re-submit.

#3 lore raw

Re: [PATCH v2 1/2] net: allwinner: reset control support

In reply to Evgeny Boger

Hi,

Quoted 14 lines · Evgeny Boger

R40 (aka V40/A40i/T3) and A10/A20 share the same EMAC IP. However, on R40 the EMAC is gated by default.

---
 .../net/allwinner,sun4i-a10-emac.yaml         | 11 +++-
 drivers/net/ethernet/allwinner/sun4i-emac.c   | 65 +++++++++++++++++--
 2 files changed, 70 insertions(+), 6 deletions(-)
Documentation/devicetree/bindings/net/allwinner,sun4i-a10-emac.yaml +0 -0
index 8d8560a67abf..27f99372d153 100644

Documentation/devicetree/bindings/net/allwinner,sun4i-a10-emac.yaml maintainers: · line 23

Quoted 10 lines
Documentation/devicetree/bindings/net/allwinner,sun4i-a10-emac.yaml +6 -1
@@ -15,7 +15,12 @@ maintainers:
 
 properties:
   compatible:
-    const: allwinner,sun4i-a10-emac
+    oneOf:
+      - const: allwinner,sun4i-a10-emac
+      - const: allwinner,sun4i-r40-emac
+      - items:
+          - const: allwinner,sun4i-r40-emac
+          - const: allwinner,sun4i-a10-emac

There's no need to handle the fallback case, it should have either one of the two, not both.

The good news is that it simplifies the binding here too, since you can use an enum

The DT binding modifications are usually in a separate patch too

Documentation/devicetree/bindings/net/allwinner,sun4i-a10-emac.yaml properties: · line 40

Quoted 10 lines
Documentation/devicetree/bindings/net/allwinner,sun4i-a10-emac.yaml +3 -0
   reg:
     maxItems: 1
@@ -30,6 +35,9 @@ properties:
     description: Phandle to the device SRAM
     $ref: /schemas/types.yaml#/definitions/phandle-array
 
+  resets:
+    maxItems: 1
+

You should make resets required for the R40 compatible too through an if clause.

It looks good otherwise, thanks!
Maxime

#4 lore raw

PATCH v2 2/2 dts: r40: add second ethernet support

In reply to Evgeny Boger

R40 (aka V40, A40i, T3) has two different Ethernet IP called EMAC and GMAC.
EMAC only support 10/100 Mbit in MII mode,
while GMAC support both 10/100 (MII) and 10/100/1000 (RGMII).

In contrast to A10/A20 where GMAC and EMAC share the same pins making EMAC somewhat pointless, on R40 EMAC can be routed to port H. Both EMAC (on port H) and GMAC (on port A)
can be then enabled at the same time, allowing for two ethernet ports.

---
 arch/arm/boot/dts/sun8i-r40.dtsi | 59 ++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
arch/arm/boot/dts/sun8i-r40.dtsi +59 -0
index d5ad3b9efd12..c31386e421b1 100644
@@ -217,6 +217,20 @@
 			#size-cells = <1>;
 			ranges;
 
+			sram_a: sram@0 {
+				compatible = "mmio-sram";
+				reg = <0x00000000 0xc000>;
+				#address-cells = <1>;
+				#size-cells = <1>;
+				ranges = <0 0x00000000 0xc000>;
+
+				emac_sram: sram-section@8000 {
+					compatible = "allwinner,sun4i-a10-sram-a3-a4";
+					reg = <0x8000 0x4000>;
+					status = "okay";
+				};
+			};
+
 			sram_c: sram@1d00000 {
 				compatible = "mmio-sram";
 				reg = <0x01d00000 0xd0000>;
@@ -541,6 +555,33 @@
 				drive-strength = <40>;
 			};
 
+			emac_pa_pins: emac-pa-pins {
+				pins = "PA0", "PA1", "PA2",
+				       "PA3", "PA4", "PA5", "PA6",
+				       "PA7", "PA8", "PA9", "PA10",
+				       "PA11", "PA12", "PA13", "PA14",
+				       "PA15", "PA16";
+				function = "emac";
+			};
+
+			emac_ph_pins: emac-ph-pins {
+				pins = "PH8", "PH9", "PH10", "PH11",
+				       "PH14", "PH15", "PH16", "PH17",
+				       "PH18","PH19", "PH20", "PH21",
+				       "PH22", "PH23", "PH24", "PH25",
+				       "PH26", "PH27";
+				function = "emac";
+			};
+
+			emac_pa_pins: emac-pa-pins {
+				pins = "PA0", "PA1", "PA2",
+				       "PA3", "PA4", "PA5", "PA6",
+				       "PA7", "PA8", "PA9", "PA10",
+				       "PA11", "PA12", "PA13", "PA14",
+				       "PA15", "PA16";
+				function = "emac";
+			};
+
 			i2c0_pins: i2c0-pins {
 				pins = "PB0", "PB1";
 				function = "i2c0";
@@ -885,6 +926,24 @@
 			};
 		};
 
+		emac: ethernet@1c0b000 {
+			compatible = "allwinner,sun4i-r40-emac";
+			reg = <0x01c0b000 0x1000>;
+			interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&ccu CLK_BUS_EMAC>;
+			resets = <&ccu RST_BUS_EMAC>;
+			allwinner,sram = <&emac_sram 1>;
+			status = "disabled";
+		};
+
+		emac_mdio: mdio@1c0b080 {
+			compatible = "allwinner,sun4i-a10-mdio";
+			reg = <0x01c0b080 0x14>;
+			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+
 		mbus: dram-controller@1c62000 {
 			compatible = "allwinner,sun8i-r40-mbus";
 			reg = <0x01c62000 0x1000>;
Signature · 1 line
2.17.1
#5 lore raw

Re: [PATCH v2 2/2] dts: r40: add second ethernet support

3/9/21 4:21 AM, Evgeny Boger пишет:

Quoted 61 lines

R40 (aka V40, A40i, T3) has two different Ethernet IP called EMAC and GMAC.
EMAC only support 10/100 Mbit in MII mode,
while GMAC support both 10/100 (MII) and 10/100/1000 (RGMII).

In contrast to A10/A20 where GMAC and EMAC share the same pins making EMAC somewhat pointless, on R40 EMAC can be routed to port H. Both EMAC (on port H) and GMAC (on port A)
can be then enabled at the same time, allowing for two ethernet ports.

---
  arch/arm/boot/dts/sun8i-r40.dtsi | 59 ++++++++++++++++++++++++++++++++
  1 file changed, 59 insertions(+)
arch/arm/boot/dts/sun8i-r40.dtsi +31 -0
index d5ad3b9efd12..c31386e421b1 100644
@@ -217,6 +217,20 @@
  			#size-cells = <1>;
  			ranges;
 
+			sram_a: sram@0 {
+				compatible = "mmio-sram";
+				reg = <0x00000000 0xc000>;
+				#address-cells = <1>;
+				#size-cells = <1>;
+				ranges = <0 0x00000000 0xc000>;
+
+				emac_sram: sram-section@8000 {
+					compatible = "allwinner,sun4i-a10-sram-a3-a4";
+					reg = <0x8000 0x4000>;
+					status = "okay";
+				};
+			};
+
  			sram_c: sram@1d00000 {
  				compatible = "mmio-sram";
  				reg = <0x01d00000 0xd0000>;
@@ -541,6 +555,33 @@
  				drive-strength = <40>;
  			};
 
+			emac_pa_pins: emac-pa-pins {
+				pins = "PA0", "PA1", "PA2",
+				       "PA3", "PA4", "PA5", "PA6",
+				       "PA7", "PA8", "PA9", "PA10",
+				       "PA11", "PA12", "PA13", "PA14",
+				       "PA15", "PA16";
+				function = "emac";
+			};
+
+			emac_ph_pins: emac-ph-pins {
+				pins = "PH8", "PH9", "PH10", "PH11",
+				       "PH14", "PH15", "PH16", "PH17",
+				       "PH18","PH19", "PH20", "PH21",
+				       "PH22", "PH23", "PH24", "PH25",
+				       "PH26", "PH27";
+				function = "emac";
+			};

arch/arm/boot/dts/sun8i-r40.dtsi line 584

Quoted 10 lines
arch/arm/boot/dts/sun8i-r40.dtsi +10 -0
+
+			emac_pa_pins: emac-pa-pins {
+				pins = "PA0", "PA1", "PA2",
+				       "PA3", "PA4", "PA5", "PA6",
+				       "PA7", "PA8", "PA9", "PA10",
+				       "PA11", "PA12", "PA13", "PA14",
+				       "PA15", "PA16";
+				function = "emac";
+			};
+

oh. a duplicate node name. I guess I've just got used to editing *after* submitting the pull request on github.

Sorry for the mess, will fix in v3.

Quoted 28 lines
arch/arm/boot/dts/sun8i-r40.dtsi +18 -0
  			i2c0_pins: i2c0-pins {
  				pins = "PB0", "PB1";
  				function = "i2c0";
@@ -885,6 +926,24 @@
  			};
  		};
 
+		emac: ethernet@1c0b000 {
+			compatible = "allwinner,sun4i-r40-emac";
+			reg = <0x01c0b000 0x1000>;
+			interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&ccu CLK_BUS_EMAC>;
+			resets = <&ccu RST_BUS_EMAC>;
+			allwinner,sram = <&emac_sram 1>;
+			status = "disabled";
+		};
+
+		emac_mdio: mdio@1c0b080 {
+			compatible = "allwinner,sun4i-a10-mdio";
+			reg = <0x01c0b080 0x14>;
+			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+
  		mbus: dram-controller@1c62000 {
  			compatible = "allwinner,sun8i-r40-mbus";
  			reg = <0x01c62000 0x1000>;
#6 lore raw

Re: [PATCH v2 2/2] dts: r40: add second ethernet support

In reply to Evgeny Boger

Hi,

Quoted 61 lines · Evgeny Boger

R40 (aka V40, A40i, T3) has two different Ethernet IP called EMAC and GMAC.
EMAC only support 10/100 Mbit in MII mode,
while GMAC support both 10/100 (MII) and 10/100/1000 (RGMII).

In contrast to A10/A20 where GMAC and EMAC share the same pins making EMAC somewhat pointless, on R40 EMAC can be routed to port H. Both EMAC (on port H) and GMAC (on port A)
can be then enabled at the same time, allowing for two ethernet ports.

---
 arch/arm/boot/dts/sun8i-r40.dtsi | 59 ++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
arch/arm/boot/dts/sun8i-r40.dtsi +31 -0
index d5ad3b9efd12..c31386e421b1 100644
@@ -217,6 +217,20 @@
 			#size-cells = <1>;
 			ranges;
 
+			sram_a: sram@0 {
+				compatible = "mmio-sram";
+				reg = <0x00000000 0xc000>;
+				#address-cells = <1>;
+				#size-cells = <1>;
+				ranges = <0 0x00000000 0xc000>;
+
+				emac_sram: sram-section@8000 {
+					compatible = "allwinner,sun4i-a10-sram-a3-a4";
+					reg = <0x8000 0x4000>;
+					status = "okay";
+				};
+			};
+
 			sram_c: sram@1d00000 {
 				compatible = "mmio-sram";
 				reg = <0x01d00000 0xd0000>;
@@ -541,6 +555,33 @@
 				drive-strength = <40>;
 			};
 
+			emac_pa_pins: emac-pa-pins {
+				pins = "PA0", "PA1", "PA2",
+				       "PA3", "PA4", "PA5", "PA6",
+				       "PA7", "PA8", "PA9", "PA10",
+				       "PA11", "PA12", "PA13", "PA14",
+				       "PA15", "PA16";
+				function = "emac";
+			};
+
+			emac_ph_pins: emac-ph-pins {
+				pins = "PH8", "PH9", "PH10", "PH11",
+				       "PH14", "PH15", "PH16", "PH17",
+				       "PH18","PH19", "PH20", "PH21",
+				       "PH22", "PH23", "PH24", "PH25",
+				       "PH26", "PH27";
+				function = "emac";
+			};

arch/arm/boot/dts/sun8i-r40.dtsi line 584

Quoted 10 lines
arch/arm/boot/dts/sun8i-r40.dtsi +10 -0
+
+			emac_pa_pins: emac-pa-pins {
+				pins = "PA0", "PA1", "PA2",
+				       "PA3", "PA4", "PA5", "PA6",
+				       "PA7", "PA8", "PA9", "PA10",
+				       "PA11", "PA12", "PA13", "PA14",
+				       "PA15", "PA16";
+				function = "emac";
+			};
+

I guess you forgot to remove that node?

Maxime