Skip to contentSkip to conversation

arm64: dts: mt8195: Add Ethernet controller

PATCH Superseded Biao Huang 3 participants 14 messages Dec 23, 2022 – Dec 29, 2022

Subsystems (5)

v5 of 8 Superseded Latest is v8 →

lore
Share & tools
lore

Biao Huang

author
#0 lore raw

v5 cover arm64: dts: mt8195: Add Ethernet controller

Changes in v5:
1. reorder the clocks as Angelo's comments
2. add a driver patch to fix rgmii-id issue, then we can use a ususal way rgmii/rgmii-id as Andrew's comments.

Changes in v4:
1. remove {address,size}-cells = <0> to avoid warning as Angelo's feedback.
2. Add reviewd-by as Angelo's comments.

Changes in v3:
1. move stmmac-axi-config, rx-queues-config, tx-queues-configs inside ethernet node as Angelo's comments.
2. add {address,size}-cells = <0> in ethernet node as Angelo's comments.

Changes in v2:
1. modify pinctrl node used by ethernet to match rules in pinctrl-mt8195.yaml, which is pointed by Krzysztof.
2. remove "mac-address" property in ethernet node as comments of Krzysztof.

Changes in v1:
add dts node for MT8195 Ethernet controller

Biao Huang (2):
stmmac: dwmac-mediatek: enable 2ns delay only for special cases
arm64: dts: mt8195: Add Ethernet controller

 arch/arm64/boot/dts/mediatek/mt8195-demo.dts  | 81 +++++++++++++++++
 arch/arm64/boot/dts/mediatek/mt8195.dtsi      | 86 +++++++++++++++++++
 .../ethernet/stmicro/stmmac/dwmac-mediatek.c  |  7 +-
 3 files changed, 173 insertions(+), 1 deletion(-)
Signature · 1 line
2.18.0
author
#1 lore raw

PATCH v5 1/2 stmmac: dwmac-mediatek: enable 2ns delay only for special cases

In current driver, MAC will always enable 2ns delay in RGMII mode, but that will lead to transmission failures for "rgmii-id"/"rgmii-txid" cases.

Modify the implementation of fix_mac_speed() to ensure the 2ns delay will only take effect for "rgmii-rxid"/"rgmii" cases, then user can choose phy-mode freely.

Fixes f2d356a6ab71 ("stmmac: dwmac-mediatek: add support for mt8195")
---
 drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +6 -1
index d42e1afb6521..cde4fb81d596 100644
@@ -447,7 +447,9 @@ static void mt8195_fix_mac_speed(void *priv, unsigned int speed)
 {
 	struct mediatek_dwmac_plat_data *priv_plat = priv;
 
-	if ((phy_interface_mode_is_rgmii(priv_plat->phy_mode))) {
+	switch (priv_plat->phy_mode) {
+	case PHY_INTERFACE_MODE_RGMII:
+	case PHY_INTERFACE_MODE_RGMII_RXID:
 		/* prefer 2ns fixed delay which is controlled by TXC_PHASE_CTRL,
 		 * when link speed is 1Gbps with RGMII interface,
 		 * Fall back to delay macro circuit for 10/100Mbps link speed.
@@ -462,6 +464,9 @@ static void mt8195_fix_mac_speed(void *priv, unsigned int speed)
 					   MT8195_RGMII_TXC_PHASE_CTRL);
 		else
 			mt8195_set_delay(priv_plat);
+		break;
+	default:
+		break;
 	}
 }
 
Signature · 1 line
2.25.1
maintainer Reviewed-by on v5 1/2
#2 lore raw

Re: [PATCH v5 1/2] stmmac: dwmac-mediatek: enable 2ns delay only for special cases

Il 23/12/22 02:50, Biao Huang ha scritto:

Quoted 10 lines

In current driver, MAC will always enable 2ns delay in RGMII mode, but that will lead to transmission failures for "rgmii-id"/"rgmii-txid" cases.

Modify the implementation of fix_mac_speed() to ensure the 2ns delay will only take effect for "rgmii-rxid"/"rgmii" cases, then user can choose phy-mode freely.

Fixes f2d356a6ab71 ("stmmac: dwmac-mediatek: add support for mt8195")
#3 lore raw

Re: [PATCH v5 1/2] stmmac: dwmac-mediatek: enable 2ns delay only for special cases

In reply to Biao Huang
Quoted 7 lines · Biao Huang

In current driver, MAC will always enable 2ns delay in RGMII mode, but that will lead to transmission failures for "rgmii-id"/"rgmii-txid" cases.

Modify the implementation of fix_mac_speed() to ensure the 2ns delay will only take effect for "rgmii-rxid"/"rgmii" cases, then user can choose phy-mode freely.

This does not seem correct. There are three ways the delays can be added:

1) The MAC
2) The PHY
3) Extra long lines on the board.

What the four RGMII modes tell you is what is needed in addition to whatever the board provides. So it describes the combination of 1) and 2). Your board does not appear to be applying any delays, so you should be using rgmii-id.

The MAC and PHY driver then need to decide how to add these delays, and in most cases, the MAC does nothing, and passes phy-mode to the PHY and the PHY adds the delay.

The MAC can add delays, but if it does, it need to mask out the delays it added to the value passed to the PHY. Otherwise the PHY will add the delay as well.

drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c static void mt8195_fix_mac_speed(void *priv, unsigned int speed) · line 455

Quoted 8 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +3 -1
-	if ((phy_interface_mode_is_rgmii(priv_plat->phy_mode))) {
+	switch (priv_plat->phy_mode) {
+	case PHY_INTERFACE_MODE_RGMII:
+	case PHY_INTERFACE_MODE_RGMII_RXID:
 		/* prefer 2ns fixed delay which is controlled by TXC_PHASE_CTRL,
 		 * when link speed is 1Gbps with RGMII interface,
 		 * Fall back to delay macro circuit for 10/100Mbps link speed.

So this is wrong. PHY_INTERFACE_MODE_RGMII means the board is adding the delay via long lines. You should not be added any delay at all.

For PHY_INTERFACE_MODE_RGMII_RXID, you need to mask the RXID bit from phy_mode when connecting the MAC to the PHY. Otherwise the PHY is going to add this delay as well.

Andrew

#4 lore raw

Re: [PATCH v5 1/2] stmmac: dwmac-mediatek: enable 2ns delay only for special cases

Dear Andrew,
Thanks for your comments.

Quoted 24 lines · Andrew Lunn
Quoted 9 lines · Biao Huang

In current driver, MAC will always enable 2ns delay in RGMII mode, but that will lead to transmission failures for "rgmii-id"/"rgmii- txid"
cases.

Modify the implementation of fix_mac_speed() to ensure the 2ns delay
will only take effect for "rgmii-rxid"/"rgmii" cases, then user can choose phy-mode freely.

This does not seem correct. There are three ways the delays can be added:

1) The MAC
2) The PHY
3) Extra long lines on the board.

What the four RGMII modes tell you is what is needed in addition to whatever the board provides. So it describes the combination of 1) and
2). Your board does not appear to be applying any delays, so you should be using rgmii-id.

Quoted 8 lines

The MAC and PHY driver then need to decide how to add these delays, and in most cases, the MAC does nothing, and passes phy-mode to the PHY and the PHY adds the delay.

The MAC can add delays, but if it does, it need to mask out the delays
it added to the value passed to the PHY. Otherwise the PHY will add the delay as well.

in the ethernet-controller.yaml,
77 # RX and TX delays are added by the MAC when required
78 - rgmii
79

 80       # RGMII with internal RX and TX delays provided by the PHY,
 81       # the MAC should not add the RX or TX delays in this case
 82       - rgmii-id
 83
 84       # RGMII with internal RX delay provided by the PHY, the MAC
 85       # should not add an RX delay in this case
 86       - rgmii-rxid
 87
 88       # RGMII with internal TX delay provided by the PHY, the MAC
 89       # should not add an TX delay in this case
 90       - rgmii-txid

so, why don't MAC set delay according to rgmii-** ?
rgmii-rxid --> mac set tx, but not set rx delay
rgmii-txid --> mac set rx, but not set tx delay
...

and PHY seems set delay according to rgmii-** in their dirver.

Quoted 15 lines
Quoted 11 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +3 -1
-	if ((phy_interface_mode_is_rgmii(priv_plat->phy_mode))) {
+	switch (priv_plat->phy_mode) {
+	case PHY_INTERFACE_MODE_RGMII:
+	case PHY_INTERFACE_MODE_RGMII_RXID:
 		/* prefer 2ns fixed delay which is controlled by

TXC_PHASE_CTRL,

(quoted diff) +0 -0
 		 * when link speed is 1Gbps with RGMII interface,
 		 * Fall back to delay macro circuit for 10/100Mbps link

speed.

So this is wrong. PHY_INTERFACE_MODE_RGMII means the board is adding the delay via long lines. You should not be added any delay at all.

Quoted 3 lines

For PHY_INTERFACE_MODE_RGMII_RXID, you need to mask the RXID bit from phy_mode when connecting the MAC to the PHY. Otherwise the PHY is going to add this delay as well.

These lines only set tx delay when phy_mode is RGMII/RGMI_RXID, when phy will not add tx delay internally.
We don't want to restrict phy-mode to rgmii-id only, so I don't think we need mask RXID bit, then, User can use rgmii-rxid/-txid/-id as their will.

If I misunderstood, please correct me. Thanks.

Quoted 2 lines

Andrew

Best Regards!
Biao

#5 lore raw

Re: [PATCH v5 1/2] stmmac: dwmac-mediatek: enable 2ns delay only for special cases

Quoted 3 lines

We don't want to restrict phy-mode to rgmii-id only, so I don't think we need mask RXID bit, then, User can use rgmii-rxid/-txid/-id as their will.

The phy-mode is a property of the board. It describes what delays are required, in addition to what the board itself provides via extra long lines. As such, there is no choice, it is set by physics.

How you implement those delays is then up to the MAC and PHY. 95% of all MAC drivers simply pass phy-mode to the PHY and let the PHY add the delays. The Renesas MAC driver is one of the exceptions, it often adds the delays, and then passes a different phy-mode to the PHY in order that there are not double delays.

So you can be different to everybody else, have MAC do one delay, and the PHY do the other. Just be aware that nobody else does this, no DT developers will expect it, etc.

Or you can just do what everybody else does and let the PHY add the delays.

What some MACs do is implement rx-internal-delay-ps and tx-internal-delay-ps These allow fine tuning of the delays. These are expected to be small values, adding 10s or 100s of pico seconds. They are not expected to be 2000ps.

Andrew

#6 lore raw

Re: [PATCH v5 1/2] stmmac: dwmac-mediatek: enable 2ns delay only for special cases

Dear Andrew,
Thanks for your comments~

Quoted 21 lines · Andrew Lunn
Quoted 5 lines

We don't want to restrict phy-mode to rgmii-id only, so I don't think
we need mask RXID bit, then, User can use rgmii-rxid/-txid/-id as their
will.

The phy-mode is a property of the board. It describes what delays are required, in addition to what the board itself provides via extra long
lines. As such, there is no choice, it is set by physics.

How you implement those delays is then up to the MAC and PHY. 95% of all MAC drivers simply pass phy-mode to the PHY and let the PHY add the delays. The Renesas MAC driver is one of the exceptions, it often adds the delays, and then passes a different phy-mode to the PHY in order that there are not double delays.

So you can be different to everybody else, have MAC do one delay, and the PHY do the other. Just be aware that nobody else does this, no DT developers will expect it, etc.

Quoted 7 lines

Or you can just do what everybody else does and let the PHY add the delays.

What some MACs do is implement rx-internal-delay-ps and tx-internal-delay-ps These allow fine tuning of the delays. These are expected to be small values, adding 10s or 100s of pico seconds. They are not expected to be 2000ps.

OK, as to this series, Is the following modification enough?
1. phy-mode = rgmii-id; in dts.
2. remove the fix_mac_speed() in driver.

Quoted 2 lines

Andrew

Best Regards!
Biao

#7 lore raw

Re: [PATCH v5 1/2] stmmac: dwmac-mediatek: enable 2ns delay only for special cases

Quoted 3 lines

OK, as to this series, Is the following modification enough?
1. phy-mode = rgmii-id; in dts.
2. remove the fix_mac_speed() in driver.

Yep, that is good.

Andrew

#8 lore raw

Re: [PATCH v5 1/2] stmmac: dwmac-mediatek: enable 2ns delay only for special cases

Dear Andrew,
Thanks for your comments~

Quoted 5 lines · Andrew Lunn
Quoted 3 lines

OK, as to this series, Is the following modification enough?
1. phy-mode = rgmii-id; in dts.
2. remove the fix_mac_speed() in driver.

Yep, that is good.

OK, will update in next send.

Quoted 2 lines

Andrew

Best Regards!
Biao

#9 lore raw

Re: [PATCH v5 1/2] stmmac: dwmac-mediatek: enable 2ns delay only for special cases

In reply to Biao Huang (黄彪)
Quoted 4 lines

************* MEDIATEK Confidentiality Notice ******************** The information contained in this e-mail message (including any attachments) may be confidential, proprietary, privileged, or otherwise exempt from disclosure under applicable laws. It is intended to be

Quoted 8 lines

conveyed only to the designated recipient(s). Any use, dissemination, distribution, printing, retaining or copying of this e-mail (including its attachments) by unintended recipient(s) is strictly prohibited and may be unlawful. If you are not an intended recipient of this e-mail, or believe that you have received this e-mail in error, please notify the sender immediately (by replying to this e-mail), delete any and all copies of this e-mail (including any attachments) from your system, and do not disclose the content of this e-mail to any other person. Thank you!

Please remove this. You are knowingly posting to a public mailing list, which is publicly archived, etc.

Andrew

#10 lore raw

Re: [PATCH v5 1/2] stmmac: dwmac-mediatek: enable 2ns delay only for special cases

Quoted 21 lines · Andrew Lunn
Quoted 12 lines

************* MEDIATEK Confidentiality Notice ******************** The information contained in this e-mail message (including any attachments) may be confidential, proprietary, privileged, or otherwise
exempt from disclosure under applicable laws. It is intended to be conveyed only to the designated recipient(s). Any use, dissemination,
distribution, printing, retaining or copying of this e-mail (including its
attachments) by unintended recipient(s) is strictly prohibited and may
be unlawful. If you are not an intended recipient of this e-mail,

Quoted 8 lines

or believe
that you have received this e-mail in error, please notify the sender
immediately (by replying to this e-mail), delete any and all copies of
this e-mail (including any attachments) from your system, and do not
disclose the content of this e-mail to any other person. Thank you!

Quoted 2 lines

Please remove this. You are knowingly posting to a public mailing list, which is publicly archived, etc.

OK, I reply with the wrong mailbox, sorry for that.

Quoted 3 lines

Andrew

Best Regards!
Biao

Quoted 1 line
author
#11 lore raw

PATCH v5 2/2 arm64: dts: mt8195: Add Ethernet controller

In reply to Biao Huang

Add Ethernet controller node for mt8195.

---
 arch/arm64/boot/dts/mediatek/mt8195-demo.dts | 81 ++++++++++++++++++
 arch/arm64/boot/dts/mediatek/mt8195.dtsi     | 86 ++++++++++++++++++++
 2 files changed, 167 insertions(+)
arch/arm64/boot/dts/mediatek/mt8195-demo.dts +81 -0
index 4fbd99eb496a..2e6979c47aa6 100644
@@ -258,6 +258,66 @@ &mt6359_vsram_others_ldo_reg {
 };
 
 &pio {
+	eth_default_pins: eth-default-pins {
+		pins-txd {
+			pinmux = <PINMUX_GPIO77__FUNC_GBE_TXD3>,
+				 <PINMUX_GPIO78__FUNC_GBE_TXD2>,
+				 <PINMUX_GPIO79__FUNC_GBE_TXD1>,
+				 <PINMUX_GPIO80__FUNC_GBE_TXD0>;
+			drive-strength = <MTK_DRIVE_8mA>;
+		};
+		pins-cc {
+			pinmux = <PINMUX_GPIO85__FUNC_GBE_TXC>,
+				 <PINMUX_GPIO88__FUNC_GBE_TXEN>,
+				 <PINMUX_GPIO87__FUNC_GBE_RXDV>,
+				 <PINMUX_GPIO86__FUNC_GBE_RXC>;
+			drive-strength = <MTK_DRIVE_8mA>;
+		};
+		pins-rxd {
+			pinmux = <PINMUX_GPIO81__FUNC_GBE_RXD3>,
+				 <PINMUX_GPIO82__FUNC_GBE_RXD2>,
+				 <PINMUX_GPIO83__FUNC_GBE_RXD1>,
+				 <PINMUX_GPIO84__FUNC_GBE_RXD0>;
+		};
+		pins-mdio {
+			pinmux = <PINMUX_GPIO89__FUNC_GBE_MDC>,
+				 <PINMUX_GPIO90__FUNC_GBE_MDIO>;
+			input-enable;
+		};
+		pins-power {
+			pinmux = <PINMUX_GPIO91__FUNC_GPIO91>,
+				 <PINMUX_GPIO92__FUNC_GPIO92>;
+			output-high;
+		};
+	};
+
+	eth_sleep_pins: eth-sleep-pins {
+		pins-txd {
+			pinmux = <PINMUX_GPIO77__FUNC_GPIO77>,
+				 <PINMUX_GPIO78__FUNC_GPIO78>,
+				 <PINMUX_GPIO79__FUNC_GPIO79>,
+				 <PINMUX_GPIO80__FUNC_GPIO80>;
+		};
+		pins-cc {
+			pinmux = <PINMUX_GPIO85__FUNC_GPIO85>,
+				 <PINMUX_GPIO88__FUNC_GPIO88>,
+				 <PINMUX_GPIO87__FUNC_GPIO87>,
+				 <PINMUX_GPIO86__FUNC_GPIO86>;
+		};
+		pins-rxd {
+			pinmux = <PINMUX_GPIO81__FUNC_GPIO81>,
+				 <PINMUX_GPIO82__FUNC_GPIO82>,
+				 <PINMUX_GPIO83__FUNC_GPIO83>,
+				 <PINMUX_GPIO84__FUNC_GPIO84>;
+		};
+		pins-mdio {
+			pinmux = <PINMUX_GPIO89__FUNC_GPIO89>,
+				 <PINMUX_GPIO90__FUNC_GPIO90>;
+			input-disable;
+			bias-disable;
+		};
+	};
+
 	gpio_keys_pins: gpio-keys-pins {
 		pins {
 			pinmux = <PINMUX_GPIO106__FUNC_GPIO106>;
@@ -434,6 +494,27 @@ &xhci0 {
 	status = "okay";
 };
 
+&eth {
+	phy-mode ="rgmii-id";
+	phy-handle = <&ethernet_phy0>;
+	snps,reset-gpio = <&pio 93 GPIO_ACTIVE_HIGH>;
+	snps,reset-delays-us = <0 10000 10000>;
+	pinctrl-names = "default", "sleep";
+	pinctrl-0 = <&eth_default_pins>;
+	pinctrl-1 = <&eth_sleep_pins>;
+	status = "okay";
+
+	mdio {
+		compatible = "snps,dwmac-mdio";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		ethernet_phy0: ethernet-phy@1 {
+			compatible = "ethernet-phy-id001c.c916";
+			reg = <0x1>;
+		};
+	};
+};
+
 &xhci1 {
 	vusb33-supply = <&mt6359_vusb_ldo_reg>;
 	status = "okay";
arch/arm64/boot/dts/mediatek/mt8195.dtsi +86 -0

92 lines not on this page · raw message

Signature · 1 line
2.25.1
#13 lore raw

Dear Angelo,
Thanks for your comments~

Quoted 2 lines · AngeloGioacchino Del Regno

Reviewed-by: AngeloGioacchino Del Regno <
[email protected]>

Will add in next send.

Best Regards!
Biao