net: stmmac: dwmac-rk: refclk for crystal-less RGMII PHY
Subsystems (6)
v2 cover net: stmmac: dwmac-rk: refclk for crystal-less RGMII PHY
The ArmSoM CM5 has an on-module MotorComm YT8531 RGMII PHY with no crystal. It takes its 25 MHz reference from the SoC (clk_mac_refout / REFCLKO25M), but rk_gmac_clk_init() only requests that clock group for RMII, so in RGMII the clock stayed off and the PHY did not answer on MDIO.
Patch 2 requests the group whenever the SoC drives the clock (clock_in_out = "output"). Patch 1 updates the binding, since RGMII with clock_in_out = "output" is now valid.
Changes in v2:
- Add patch 1 documenting clock_in_out = "output" for RGMII in the rockchip-dwmac binding (Maxime Chevallier).
Jiaxing Hu (2):
dt-bindings: net: rockchip-dwmac: allow output clock_in_out for RGMII
net: stmmac: dwmac-rk: enable the reference clock for output mode
Documentation/devicetree/bindings/net/rockchip-dwmac.yaml | 5 +++-- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-)
Signature · 1 line
2.43.0
PATCH v2 1/2 dt-bindings: net: rockchip-dwmac: allow output clock_in_out for RGMII
The clock_in_out description said RGMII must use "input". That is no longer true: an RGMII PHY with no crystal can take its 25 MHz reference from the SoC, in which case clock_in_out is "output". Document it.
--- Documentation/devicetree/bindings/net/rockchip-dwmac.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/net/rockchip-dwmac.yaml +3 -2
@@ -89,8 +89,9 @@ properties: clock_in_out: description: - For RGMII, it must be "input", means main clock(125MHz) - is not sourced from SoC's PLL, but input from PHY. + For RGMII, "input" means the 125MHz main clock is input from the + PHY, not sourced from the SoC PLL; "output" means the SoC provides + a 25MHz reference clock out to a crystal-less PHY. For RMII, "input" means PHY provides the reference clock(50MHz), "output" means GMAC provides the reference clock. $ref: /schemas/types.yaml#/definitions/string
Signature · 1 line
2.43.0
PATCH v2 2/2 net: stmmac: dwmac-rk: enable the reference clock for output mode
In reply to Jiaxing Hurk_gmac_clk_init() only requests the refout clock group for RMII. The ArmSoM CM5 has an on-module YT8531 RGMII PHY with no crystal that needs the SoC 25 MHz reference (clk_mac_refout), so in RGMII the clock was never enabled and the PHY did not respond on MDIO.
Request the group whenever the SoC drives the clock (clock_in_out = "output"), not just for RMII. The clocks are optional, so other boards are unaffected.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +2 -2
@@ -1112,7 +1112,7 @@ static int rk_gmac_clk_init(struct plat_stmmacenet_data *plat) bsp_priv->clk_enabled = false; bsp_priv->num_clks =ARRAY_SIZE (rk_clocks); -if (phy_iface ==PHY_INTERFACE_MODE_RMII ) +if (phy_iface ==PHY_INTERFACE_MODE_RMII || !bsp_priv->clock_input) bsp_priv->num_clks +=ARRAY_SIZE (rk_rmii_clocks); bsp_priv->clks = devm_kcalloc(dev, bsp_priv->num_clks,
@@ -1123,7 +1123,7 @@ static int rk_gmac_clk_init(struct plat_stmmacenet_data *plat)for (i =0 ; i <ARRAY_SIZE (rk_clocks); i++) bsp_priv->clks[i].id = rk_clocks[i]; -if (phy_iface ==PHY_INTERFACE_MODE_RMII ) { +if (phy_iface ==PHY_INTERFACE_MODE_RMII || !bsp_priv->clock_input) {for (j =0 ; j <ARRAY_SIZE (rk_rmii_clocks); j++) bsp_priv->clks[i++].id = rk_rmii_clocks[j]; }
Signature · 1 line
2.43.0
Maxime Chevallier
maintainerRe: [PATCH net-next v2 2/2] net: stmmac: dwmac-rk: enable the reference clock for output mode
Hi,
Quoted 8 lines · Jiaxing Hu
rk_gmac_clk_init()only requests the refout clock group for RMII. The ArmSoM CM5 has an on-module YT8531 RGMII PHY with no crystal that needs the SoC 25 MHz reference (clk_mac_refout), so in RGMII the clock was never enabled and the PHY did not respond on MDIO.Request the group whenever the SoC drives the clock (
clock_in_out= "output"), not just for RMII. The clocks are optional, so other boards are unaffected.
You've taken my review into account (thanks :) ), but you're failing to address Andrew's comment.
The PHY should be the one requesting the MAC to output the refclk, in that case the MAC will act as a clock provider, something like this :
https://elixir.bootlin.com/linux/v7.1.3/source/drivers/net/phy/air_en8811h.c#L1156
The PHY then requests the clock (probably an optional clock).
Maxime
Re: [PATCH net-next v2 2/2] net: stmmac: dwmac-rk: enable the reference clock for output mode
Quoted 5 lines
You've taken my review into account (thanks :) ), but you're failing to address Andrew's comment.
The PHY should be the one requesting the MAC to output the refclk, in that case the MAC will act as a clock provider [...]
You are both right, and I am sorry I missed Andrew's point on v1. The MAC should not own the PHY's clock.
I have dropped this series. Instead the motorcomm driver now enables the reference clock itself, which is the consumer that needs it:
https://lore.kernel.org/all/[email protected]/
The device tree names the YT8531 explicitly so the PHY is instantiated without an MDIO ID probe, which it cannot answer before that clock runs; the DTS goes to the rockchip tree. Tested on an ArmSoM CM5-IO: the PHY links at 1000 Mbit/s with no dwmac-rk change at all.
Thanks for the review,
Jiaxing