forked from Openwrt/openwrt
9001014a24
Backport patch merged upstream for rgmii-id support in stmmac-ipq806x. This is needed for some device that directly connets PHY to the gmac port and require rgmii-id phy-modes. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
69 lines
2.7 KiB
Diff
69 lines
2.7 KiB
Diff
From abb45a2477f533cd4aab3085defdff131e2e8c4f Mon Sep 17 00:00:00 2001
|
|
From: Christian Marangi <ansuelsmth@gmail.com>
|
|
Date: Mon, 6 May 2024 14:32:46 +0200
|
|
Subject: [PATCH] net: stmmac: dwmac-ipq806x: account for rgmii-txid/rxid/id
|
|
phy-mode
|
|
|
|
Currently the ipq806x dwmac driver is almost always used attached to the
|
|
CPU port of a switch and phy-mode was always set to "rgmii" or "sgmii".
|
|
|
|
Some device came up with a special configuration where the PHY is
|
|
directly attached to the GMAC port and in those case phy-mode needs to
|
|
be set to "rgmii-id" to make the PHY correctly work and receive packets.
|
|
|
|
Since the driver supports only "rgmii" and "sgmii" mode, when "rgmii-id"
|
|
(or variants) mode is set, the mode is rejected and probe fails.
|
|
|
|
Add support also for these phy-modes to correctly setup PHYs that requires
|
|
delay applied to tx/rx.
|
|
|
|
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 12 ++++++++++++
|
|
1 file changed, 12 insertions(+)
|
|
|
|
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c
|
|
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c
|
|
@@ -171,6 +171,9 @@ static int ipq806x_gmac_set_speed(struct
|
|
|
|
switch (gmac->phy_mode) {
|
|
case PHY_INTERFACE_MODE_RGMII:
|
|
+ case PHY_INTERFACE_MODE_RGMII_ID:
|
|
+ case PHY_INTERFACE_MODE_RGMII_RXID:
|
|
+ case PHY_INTERFACE_MODE_RGMII_TXID:
|
|
div = get_clk_div_rgmii(gmac, speed);
|
|
clk_bits = NSS_COMMON_CLK_GATE_RGMII_RX_EN(gmac->id) |
|
|
NSS_COMMON_CLK_GATE_RGMII_TX_EN(gmac->id);
|
|
@@ -412,6 +415,9 @@ static int ipq806x_gmac_probe(struct pla
|
|
val |= NSS_COMMON_GMAC_CTL_CSYS_REQ;
|
|
switch (gmac->phy_mode) {
|
|
case PHY_INTERFACE_MODE_RGMII:
|
|
+ case PHY_INTERFACE_MODE_RGMII_ID:
|
|
+ case PHY_INTERFACE_MODE_RGMII_RXID:
|
|
+ case PHY_INTERFACE_MODE_RGMII_TXID:
|
|
val |= NSS_COMMON_GMAC_CTL_PHY_IFACE_SEL;
|
|
break;
|
|
case PHY_INTERFACE_MODE_SGMII:
|
|
@@ -427,6 +433,9 @@ static int ipq806x_gmac_probe(struct pla
|
|
val &= ~(1 << NSS_COMMON_CLK_SRC_CTRL_OFFSET(gmac->id));
|
|
switch (gmac->phy_mode) {
|
|
case PHY_INTERFACE_MODE_RGMII:
|
|
+ case PHY_INTERFACE_MODE_RGMII_ID:
|
|
+ case PHY_INTERFACE_MODE_RGMII_RXID:
|
|
+ case PHY_INTERFACE_MODE_RGMII_TXID:
|
|
val |= NSS_COMMON_CLK_SRC_CTRL_RGMII(gmac->id) <<
|
|
NSS_COMMON_CLK_SRC_CTRL_OFFSET(gmac->id);
|
|
break;
|
|
@@ -444,6 +453,9 @@ static int ipq806x_gmac_probe(struct pla
|
|
val |= NSS_COMMON_CLK_GATE_PTP_EN(gmac->id);
|
|
switch (gmac->phy_mode) {
|
|
case PHY_INTERFACE_MODE_RGMII:
|
|
+ case PHY_INTERFACE_MODE_RGMII_ID:
|
|
+ case PHY_INTERFACE_MODE_RGMII_RXID:
|
|
+ case PHY_INTERFACE_MODE_RGMII_TXID:
|
|
val |= NSS_COMMON_CLK_GATE_RGMII_RX_EN(gmac->id) |
|
|
NSS_COMMON_CLK_GATE_RGMII_TX_EN(gmac->id);
|
|
break;
|