net: stmmac/xpcs: convert to pcs_validate()

stmmac explicitly calls the xpcs driver to validate the ethtool
linkmodes. This is no longer necessary as phylink now supports
validation through a PCS method. Convert both drivers to use this
new mechanism.

Tested-by: Wong Vee Khee <vee.khee.wong@linux.intel.com> # Intel EHL
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/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index bd20920daf7b48f9c541a961ee2dd424de444bb0..029f21b9d452f1d3fdb4ac8b6bd8b3fb6394a168 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -940,7 +940,6 @@ static void stmmac_validate(struct phylink_config *config,
                            unsigned long *supported,
                            struct phylink_link_state *state)
 {
-       struct stmmac_priv *priv = netdev_priv(to_net_dev(config->dev));
        __ETHTOOL_DECLARE_LINK_MODE_MASK(mac_supported) = { 0, };
 
        /* This is very similar to phylink_generic_validate() except that
@@ -958,10 +957,6 @@ static void stmmac_validate(struct phylink_config *config,
 
        linkmode_and(supported, supported, mac_supported);
        linkmode_and(state->advertising, state->advertising, mac_supported);
-
-       /* If PCS is supported, check which modes it supports. */
-       if (priv->hw->xpcs)
-               xpcs_validate(priv->hw->xpcs, supported, state);
 }
 
 static void stmmac_mac_config(struct phylink_config *config, unsigned int mode,

diff --git a/drivers/net/pcs/pcs-xpcs.c b/drivers/net/pcs/pcs-xpcs.c
index f45821524fab189cfa143b761b2959ec025814aa..61418d4dc0cd25351b341cfe6b875b9b64330dc2 100644 (file)
--- a/drivers/net/pcs/pcs-xpcs.c
+++ b/drivers/net/pcs/pcs-xpcs.c
@@ -632,35 +632,29 @@ static void xpcs_resolve_pma(struct dw_xpcs *xpcs,
        }
 }
 
-void xpcs_validate(struct dw_xpcs *xpcs, unsigned long *supported,
-                  struct phylink_link_state *state)
+static int xpcs_validate(struct phylink_pcs *pcs, unsigned long *supported,
+                        const struct phylink_link_state *state)
 {
-       __ETHTOOL_DECLARE_LINK_MODE_MASK(xpcs_supported);
+       __ETHTOOL_DECLARE_LINK_MODE_MASK(xpcs_supported) = { 0, };
        const struct xpcs_compat *compat;
+       struct dw_xpcs *xpcs;
        int i;
 
-       /* phylink expects us to report all supported modes with
-        * PHY_INTERFACE_MODE_NA, just don't limit the supported and
-        * advertising masks and exit.
-        */
-       if (state->interface == PHY_INTERFACE_MODE_NA)
-               return;
-
-       linkmode_zero(xpcs_supported);
-
+       xpcs = phylink_pcs_to_xpcs(pcs);
        compat = xpcs_find_compat(xpcs->id, state->interface);
 
-       /* Populate the supported link modes for this
-        * PHY interface type
+       /* Populate the supported link modes for this PHY interface type.
+        * FIXME: what about the port modes and autoneg bit? This masks
+        * all those away.
         */
        if (compat)
                for (i = 0; compat->supported[i] != __ETHTOOL_LINK_MODE_MASK_NBITS; i++)
                        set_bit(compat->supported[i], xpcs_supported);
 
        linkmode_and(supported, supported, xpcs_supported);
-       linkmode_and(state->advertising, state->advertising, xpcs_supported);
+
+       return 0;
 }
-EXPORT_SYMBOL_GPL(xpcs_validate);
 
 void xpcs_get_interfaces(struct dw_xpcs *xpcs, unsigned long *interfaces)
 {
@@ -1120,6 +1114,7 @@ static const struct xpcs_id xpcs_id_list[] = {
 };
 
 static const struct phylink_pcs_ops xpcs_phylink_ops = {
+       .pcs_validate = xpcs_validate,
        .pcs_config = xpcs_config,
        .pcs_get_state = xpcs_get_state,
        .pcs_link_up = xpcs_link_up,

diff --git a/include/linux/pcs/pcs-xpcs.h b/include/linux/pcs/pcs-xpcs.h
index 3126a4924d929ab35bfb45a1103b2392950caed2..266eb26fb02903cff5fcfc15034f84ed1f1957d0 100644 (file)
--- a/include/linux/pcs/pcs-xpcs.h
+++ b/include/linux/pcs/pcs-xpcs.h
@@ -31,8 +31,6 @@ void xpcs_link_up(struct phylink_pcs *pcs, unsigned int mode,
                  phy_interface_t interface, int speed, int duplex);
 int xpcs_do_config(struct dw_xpcs *xpcs, phy_interface_t interface,
                   unsigned int mode);
-void xpcs_validate(struct dw_xpcs *xpcs, unsigned long *supported,
-                  struct phylink_link_state *state);
 void xpcs_get_interfaces(struct dw_xpcs *xpcs, unsigned long *interfaces);
 int xpcs_config_eee(struct dw_xpcs *xpcs, int mult_fact_100ns,
                    int enable);