net: mediatek: add support for SGMII 1Gbps auto-negotiation mode

Existing SGMII support of mtk-eth is actually a MediaTek-specific
2.5Gbps high-speed SGMII (HSGMII) which does not support
auto-negotiation mode.

This patch adds SGMII 1Gbps auto-negotiation mode and rename the
existing HSGMII to 2500basex.

Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>

diff --git a/drivers/net/mtk_eth.c b/drivers/net/mtk_eth.c
index 2b4a862695243aff3791ebe643b8b6c9b3778998..e0064276d02199a6647b0c1f392d755bcd86147b 100644 (file)
--- a/drivers/net/mtk_eth.c
+++ b/drivers/net/mtk_eth.c
@@ -893,7 +893,7 @@ static int mt7531_setup(struct mtk_eth_priv *priv)
                if (!port5_sgmii)
                        mt7531_port_rgmii_init(priv, 5);
                break;
-       case PHY_INTERFACE_MODE_SGMII:
+       case PHY_INTERFACE_MODE_2500BASEX:
                mt7531_port_sgmii_init(priv, 6);
                if (port5_sgmii)
                        mt7531_port_sgmii_init(priv, 5);
@@ -986,6 +986,7 @@ static void mtk_phy_link_adjust(struct mtk_eth_priv *priv)
              (MAC_RX_PKT_LEN_1536 << MAC_RX_PKT_LEN_S) |
              MAC_MODE | FORCE_MODE |
              MAC_TX_EN | MAC_RX_EN |
+             DEL_RXFIFO_CLR |
              BKOFF_EN | BACKPR_EN;
 
        switch (priv->phydev->speed) {
@@ -996,6 +997,7 @@ static void mtk_phy_link_adjust(struct mtk_eth_priv *priv)
                mcr |= (SPEED_100M << FORCE_SPD_S);
                break;
        case SPEED_1000:
+       case SPEED_2500:
                mcr |= (SPEED_1000M << FORCE_SPD_S);
                break;
        };
@@ -1048,7 +1050,8 @@ static int mtk_phy_start(struct mtk_eth_priv *priv)
                return 0;
        }
 
-       mtk_phy_link_adjust(priv);
+       if (!priv->force_mode)
+               mtk_phy_link_adjust(priv);
 
        debug("Speed: %d, %s duplex%s\n", phydev->speed,
              (phydev->duplex) ? "full" : "half",
@@ -1076,7 +1079,31 @@ static int mtk_phy_probe(struct udevice *dev)
        return 0;
 }
 
-static void mtk_sgmii_init(struct mtk_eth_priv *priv)
+static void mtk_sgmii_an_init(struct mtk_eth_priv *priv)
+{
+       /* Set SGMII GEN1 speed(1G) */
+       clrsetbits_le32(priv->sgmii_base + priv->soc->ana_rgc3,
+                       SGMSYS_SPEED_2500, 0);
+
+       /* Enable SGMII AN */
+       setbits_le32(priv->sgmii_base + SGMSYS_PCS_CONTROL_1,
+                    SGMII_AN_ENABLE);
+
+       /* SGMII AN mode setting */
+       writel(SGMII_AN_MODE, priv->sgmii_base + SGMSYS_SGMII_MODE);
+
+       /* SGMII PN SWAP setting */
+       if (priv->pn_swap) {
+               setbits_le32(priv->sgmii_base + SGMSYS_QPHY_WRAP_CTRL,
+                            SGMII_PN_SWAP_TX_RX);
+       }
+
+       /* Release PHYA power down state */
+       clrsetbits_le32(priv->sgmii_base + SGMSYS_QPHY_PWR_STATE_CTRL,
+                       SGMII_PHYA_PWD, 0);
+}
+
+static void mtk_sgmii_force_init(struct mtk_eth_priv *priv)
 {
        /* Set SGMII GEN2 speed(2.5G) */
        setbits_le32(priv->sgmii_base + priv->soc->ana_rgc3,
@@ -1111,10 +1138,14 @@ static void mtk_mac_init(struct mtk_eth_priv *priv)
                ge_mode = GE_MODE_RGMII;
                break;
        case PHY_INTERFACE_MODE_SGMII:
+       case PHY_INTERFACE_MODE_2500BASEX:
                ge_mode = GE_MODE_RGMII;
                mtk_ethsys_rmw(priv, ETHSYS_SYSCFG0_REG, SYSCFG0_SGMII_SEL_M,
                               SYSCFG0_SGMII_SEL(priv->gmac_id));
-               mtk_sgmii_init(priv);
+               if (priv->phy_interface == PHY_INTERFACE_MODE_SGMII)
+                       mtk_sgmii_an_init(priv);
+               else
+                       mtk_sgmii_force_init(priv);
                break;
        case PHY_INTERFACE_MODE_MII:
        case PHY_INTERFACE_MODE_GMII:
@@ -1148,6 +1179,7 @@ static void mtk_mac_init(struct mtk_eth_priv *priv)
                        mcr |= SPEED_100M << FORCE_SPD_S;
                        break;
                case SPEED_1000:
+               case SPEED_2500:
                        mcr |= SPEED_1000M << FORCE_SPD_S;
                        break;
                }
@@ -1490,13 +1522,15 @@ static int mtk_eth_of_to_plat(struct udevice *dev)
                priv->duplex = ofnode_read_bool(subnode, "full-duplex");
 
                if (priv->speed != SPEED_10 && priv->speed != SPEED_100 &&
-                   priv->speed != SPEED_1000) {
+                   priv->speed != SPEED_1000 && priv->speed != SPEED_2500 &&
+                   priv->speed != SPEED_10000) {
                        printf("error: no valid speed set in fixed-link\n");
                        return -EINVAL;
                }
        }
 
-       if (priv->phy_interface == PHY_INTERFACE_MODE_SGMII) {
+       if (priv->phy_interface == PHY_INTERFACE_MODE_SGMII ||
+           priv->phy_interface == PHY_INTERFACE_MODE_2500BASEX) {
                /* get corresponding sgmii phandle */
                ret = dev_read_phandle_with_args(dev, "mediatek,sgmiisys",
                                                 NULL, 0, 0, &args);

diff --git a/drivers/net/mtk_eth.h b/drivers/net/mtk_eth.h
index 1382ccbeb21ec062900bb3a7c647559f5f64e710..320266cd82a83f8459f5008742bffbb5eaecfc93 100644 (file)
--- a/drivers/net/mtk_eth.h
+++ b/drivers/net/mtk_eth.h
@@ -69,6 +69,7 @@ enum mkt_eth_capabilities {
 #define SGMII_AN_RESTART               BIT(9)
 
 #define SGMSYS_SGMII_MODE              0x20
+#define SGMII_AN_MODE                  0x31120103
 #define SGMII_FORCE_MODE               0x31120019
 
 #define SGMSYS_QPHY_PWR_STATE_CTRL     0xe8
@@ -168,6 +169,7 @@ enum mkt_eth_capabilities {
 #define FORCE_MODE                     BIT(15)
 #define MAC_TX_EN                      BIT(14)
 #define MAC_RX_EN                      BIT(13)
+#define DEL_RXFIFO_CLR                 BIT(12)
 #define BKOFF_EN                       BIT(9)
 #define BACKPR_EN                      BIT(8)
 #define FORCE_RX_FC                    BIT(5)