net: dsa: sja1105: convert to phylink_generic_validate()

Populate the MAC capabilities for the SJA1105 DSA switch using the same
decision making which sja1105_phylink_validate() uses. Remove the now
obsolete sja1105_phylink_validate() implementation to allow DSA to use
phylink_generic_validate() for this switch driver.

As noted by Vladimir, this fixes an inconsequential bug which allowed
gigabit and lower interface modes to be indicated when operating in
2500base-X mode.

Reviewed-by: Vladimir Oltean <olteanv@gmail.com>                                Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
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 8f061cce77f0f92345f67cab9aeb51e329fb9ca4..5beef06d8ff72a2ccb915677f91831807e85a607 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_main.c
+++ b/drivers/net/dsa/sja1105/sja1105_main.c
@@ -1395,6 +1395,7 @@ static void sja1105_phylink_get_caps(struct dsa_switch *ds, int port,
                                     struct phylink_config *config)
 {
        struct sja1105_private *priv = ds->priv;
+       struct sja1105_xmii_params_entry *mii;
 
        /* This driver does not make use of the speed, duplex, pause or the
         * advertisement in its mac_config, so it is safe to mark this driver
@@ -1407,40 +1408,19 @@ static void sja1105_phylink_get_caps(struct dsa_switch *ds, int port,
         * we have to program that early.
         */
        __set_bit(priv->phy_mode[port], config->supported_interfaces);
-}
-
-static void sja1105_phylink_validate(struct dsa_switch *ds, int port,
-                                    unsigned long *supported,
-                                    struct phylink_link_state *state)
-{
-       /* Construct a new mask which exhaustively contains all link features
-        * supported by the MAC, and then apply that (logical AND) to what will
-        * be sent to the PHY for "marketing".
-        */
-       __ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
-       struct sja1105_private *priv = ds->priv;
-       struct sja1105_xmii_params_entry *mii;
-
-       mii = priv->static_config.tables[BLK_IDX_XMII_PARAMS].entries;
 
        /* The MAC does not support pause frames, and also doesn't
         * support half-duplex traffic modes.
         */
-       phylink_set(mask, Autoneg);
-       phylink_set(mask, MII);
-       phylink_set(mask, 10baseT_Full);
-       phylink_set(mask, 100baseT_Full);
-       phylink_set(mask, 100baseT1_Full);
+       config->mac_capabilities = MAC_10FD | MAC_100FD;
+
+       mii = priv->static_config.tables[BLK_IDX_XMII_PARAMS].entries;
        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);
-       }
+               config->mac_capabilities |= MAC_1000FD;
 
-       linkmode_and(supported, supported, mask);
-       linkmode_and(state->advertising, state->advertising, mask);
+       if (priv->info->supports_2500basex[port])
+               config->mac_capabilities |= MAC_2500FD;
 }
 
 static int
@@ -3140,7 +3120,6 @@ static const struct dsa_switch_ops sja1105_switch_ops = {
        .port_change_mtu        = sja1105_change_mtu,
        .port_max_mtu           = sja1105_get_max_mtu,
        .phylink_get_caps       = sja1105_phylink_get_caps,
-       .phylink_validate       = sja1105_phylink_validate,
        .phylink_mac_select_pcs = sja1105_mac_select_pcs,
        .phylink_mac_link_up    = sja1105_mac_link_up,
        .phylink_mac_link_down  = sja1105_mac_link_down,