net: dsa: b53: add support for BCM63xx RGMIIs

BCM63xx RGMII ports require additional configuration in order to work.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lore.kernel.org/r/20230319220805.124024-1-noltari@gmail.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
index 59cdfc51ce06a0de3fb644eae5eebe4fe2dd9b21..6e212f6f1cb9b42692f716351f33fef3e6846af6 100644 (file)
--- a/drivers/net/dsa/b53/b53_common.c
+++ b/drivers/net/dsa/b53/b53_common.c
@@ -1209,6 +1209,46 @@ static void b53_force_port_config(struct b53_device *dev, int port,
        b53_write8(dev, B53_CTRL_PAGE, off, reg);
 }
 
+static void b53_adjust_63xx_rgmii(struct dsa_switch *ds, int port,
+                                 phy_interface_t interface)
+{
+       struct b53_device *dev = ds->priv;
+       u8 rgmii_ctrl = 0, off;
+
+       if (port == dev->imp_port)
+               off = B53_RGMII_CTRL_IMP;
+       else
+               off = B53_RGMII_CTRL_P(port);
+
+       b53_read8(dev, B53_CTRL_PAGE, off, &rgmii_ctrl);
+
+       switch (interface) {
+       case PHY_INTERFACE_MODE_RGMII_ID:
+               rgmii_ctrl |= (RGMII_CTRL_DLL_RXC | RGMII_CTRL_DLL_TXC);
+               break;
+       case PHY_INTERFACE_MODE_RGMII_RXID:
+               rgmii_ctrl &= ~(RGMII_CTRL_DLL_TXC);
+               rgmii_ctrl |= RGMII_CTRL_DLL_RXC;
+               break;
+       case PHY_INTERFACE_MODE_RGMII_TXID:
+               rgmii_ctrl &= ~(RGMII_CTRL_DLL_RXC);
+               rgmii_ctrl |= RGMII_CTRL_DLL_TXC;
+               break;
+       case PHY_INTERFACE_MODE_RGMII:
+       default:
+               rgmii_ctrl &= ~(RGMII_CTRL_DLL_RXC | RGMII_CTRL_DLL_TXC);
+               break;
+       }
+
+       if (port != dev->imp_port)
+               rgmii_ctrl |= RGMII_CTRL_ENABLE_GMII;
+
+       b53_write8(dev, B53_CTRL_PAGE, off, rgmii_ctrl);
+
+       dev_dbg(ds->dev, "Configured port %d for %s\n", port,
+               phy_modes(interface));
+}
+
 static void b53_adjust_link(struct dsa_switch *ds, int port,
                            struct phy_device *phydev)
 {
@@ -1235,6 +1275,9 @@ static void b53_adjust_link(struct dsa_switch *ds, int port,
                              tx_pause, rx_pause);
        b53_force_link(dev, port, phydev->link);
 
+       if (is63xx(dev) && port >= B53_63XX_RGMII0)
+               b53_adjust_63xx_rgmii(ds, port, phydev->interface);
+
        if (is531x5(dev) && phy_interface_is_rgmii(phydev)) {
                if (port == dev->imp_port)
                        off = B53_RGMII_CTRL_IMP;
@@ -1402,6 +1445,9 @@ void b53_phylink_mac_link_up(struct dsa_switch *ds, int port,
 {
        struct b53_device *dev = ds->priv;
 
+       if (is63xx(dev) && port >= B53_63XX_RGMII0)
+               b53_adjust_63xx_rgmii(ds, port, interface);
+
        if (mode == MLO_AN_PHY)
                return;
 

diff --git a/drivers/net/dsa/b53/b53_priv.h b/drivers/net/dsa/b53/b53_priv.h
index 795cbffd5c2be43a468c46371fe8c2aa161ef507..4cf9f540696e3f5fa3eb8b3aa01312b9c803f4dd 100644 (file)
--- a/drivers/net/dsa/b53/b53_priv.h
+++ b/drivers/net/dsa/b53/b53_priv.h
@@ -211,6 +211,7 @@ static inline int is58xx(struct b53_device *dev)
                dev->chip_id == BCM7278_DEVICE_ID;
 }
 
+#define B53_63XX_RGMII0        4
 #define B53_CPU_PORT_25        5
 #define B53_CPU_PORT   8