net: dsa: sja1105: plug in support for 2500base-x

The MAC treats 2500base-x same as SGMII (yay for that) except that it
must be set to a different speed.

Extend all places that check for SGMII to also check for 2500base-x.

Also add the missing 2500base-x compatibility matrix entry for SJA1110D.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c
index 3e32b86..8e5cdf9 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_main.c
+++ b/drivers/net/dsa/sja1105/sja1105_main.c
@@ -1056,6 +1056,9 @@ static int sja1105_adjust_port_config(struct sja1105_private *priv, int port,
        case SPEED_1000:
                speed = priv->info->port_speed[SJA1105_SPEED_1000MBPS];
                break;
+       case SPEED_2500:
+               speed = priv->info->port_speed[SJA1105_SPEED_2500MBPS];
+               break;
        default:
                dev_err(dev, "Invalid speed %iMbps\n", speed_mbps);
                return -EINVAL;
@@ -1070,6 +1073,8 @@ static int sja1105_adjust_port_config(struct sja1105_private *priv, int port,
         */
        if (priv->phy_mode[port] == PHY_INTERFACE_MODE_SGMII)
                mac[port].speed = priv->info->port_speed[SJA1105_SPEED_1000MBPS];
+       else if (priv->phy_mode[port] == PHY_INTERFACE_MODE_2500BASEX)
+               mac[port].speed = priv->info->port_speed[SJA1105_SPEED_2500MBPS];
        else
                mac[port].speed = speed;
 
@@ -1182,6 +1187,10 @@ static void sja1105_phylink_validate(struct dsa_switch *ds, int port,
        if (mii->xmii_mode[port] == XMII_MODE_RGMII ||
            mii->xmii_mode[port] == XMII_MODE_SGMII)
                phylink_set(mask, 1000baseT_Full);
+       if (priv->info->supports_2500basex[port]) {
+               phylink_set(mask, 2500baseT_Full);
+               phylink_set(mask, 2500baseX_Full);
+       }
 
        bitmap_and(supported, supported, mask, __ETHTOOL_LINK_MODE_MASK_NBITS);
        bitmap_and(state->advertising, state->advertising, mask,
@@ -1942,7 +1951,9 @@ out_unlock_ptp:
                if (!phylink_autoneg_inband(mode)) {
                        int speed = SPEED_UNKNOWN;
 
-                       if (bmcr[i] & BMCR_SPEED1000)
+                       if (priv->phy_mode[i] == PHY_INTERFACE_MODE_2500BASEX)
+                               speed = SPEED_2500;
+                       else if (bmcr[i] & BMCR_SPEED1000)
                                speed = SPEED_1000;
                        else if (bmcr[i] & BMCR_SPEED100)
                                speed = SPEED_100;

diff --git a/drivers/net/dsa/sja1105/sja1105_mdio.c b/drivers/net/dsa/sja1105/sja1105_mdio.c
index 41468e5..19aea8f 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_mdio.c
+++ b/drivers/net/dsa/sja1105/sja1105_mdio.c
@@ -427,7 +427,8 @@ static int sja1105_mdiobus_pcs_register(struct sja1105_private *priv)
                if (dsa_is_unused_port(ds, port))
                        continue;
 
-               if (priv->phy_mode[port] != PHY_INTERFACE_MODE_SGMII)
+               if (priv->phy_mode[port] != PHY_INTERFACE_MODE_SGMII &&
+                   priv->phy_mode[port] != PHY_INTERFACE_MODE_2500BASEX)
                        continue;
 
                mdiodev = mdio_device_create(bus, port);

diff --git a/drivers/net/dsa/sja1105/sja1105_spi.c b/drivers/net/dsa/sja1105/sja1105_spi.c
index 96768af..7c493c6 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_spi.c
+++ b/drivers/net/dsa/sja1105/sja1105_spi.c
@@ -967,6 +967,8 @@ const struct sja1105_info sja1110d_info = {
                                   false, false, false, false, false, false},
        .supports_sgmii         = {false, true, true, true, true,
                                   false, false, false, false, false, false},
+       .supports_2500basex     = {false, false, false, true, true,
+                                  false, false, false, false, false, false},
        .internal_phy           = {SJA1105_NO_PHY, SJA1105_NO_PHY,
                                   SJA1105_NO_PHY, SJA1105_NO_PHY,
                                   SJA1105_NO_PHY, SJA1105_PHY_BASE_T1,