net: dsa: remove legacy_pre_march2020 detection

All drivers are now updated for the March 2020 changes, and no longer
make use of the mac_pcs_get_state() or mac_an_restart() operations,
which are now NULL across all DSA drivers. All DSA drivers don't look
at speed, duplex, pause or advertisement in their phylink_mac_config()
method either.

Remove support for these operations from DSA, and stop marking DSA as
a legacy driver by default.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/include/net/dsa.h b/include/net/dsa.h
index d309ee7ed04bbc1be769e0712ea704e34bcd9217..0b9c6aa2704748ac843e17043144643bab254115 100644 (file)
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -873,8 +873,6 @@ struct dsa_switch_ops {
        struct phylink_pcs *(*phylink_mac_select_pcs)(struct dsa_switch *ds,
                                                      int port,
                                                      phy_interface_t iface);
-       int     (*phylink_mac_link_state)(struct dsa_switch *ds, int port,
-                                         struct phylink_link_state *state);
        int     (*phylink_mac_prepare)(struct dsa_switch *ds, int port,
                                       unsigned int mode,
                                       phy_interface_t interface);
@@ -884,7 +882,6 @@ struct dsa_switch_ops {
        int     (*phylink_mac_finish)(struct dsa_switch *ds, int port,
                                      unsigned int mode,
                                      phy_interface_t interface);
-       void    (*phylink_mac_an_restart)(struct dsa_switch *ds, int port);
        void    (*phylink_mac_link_down)(struct dsa_switch *ds, int port,
                                         unsigned int mode,
                                         phy_interface_t interface);

diff --git a/net/dsa/port.c b/net/dsa/port.c
index 0ce8fd311c78758502ca1ced0961aebc024eb13f..c63cbfbe6489a70f70df281bcb61aca1dea915e9 100644 (file)
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -1568,27 +1568,6 @@ static void dsa_port_phylink_validate(struct phylink_config *config,
                phylink_generic_validate(config, supported, state);
 }
 
-static void dsa_port_phylink_mac_pcs_get_state(struct phylink_config *config,
-                                              struct phylink_link_state *state)
-{
-       struct dsa_port *dp = container_of(config, struct dsa_port, pl_config);
-       struct dsa_switch *ds = dp->ds;
-       int err;
-
-       /* Only called for inband modes */
-       if (!ds->ops->phylink_mac_link_state) {
-               state->link = 0;
-               return;
-       }
-
-       err = ds->ops->phylink_mac_link_state(ds, dp->index, state);
-       if (err < 0) {
-               dev_err(ds->dev, "p%d: phylink_mac_link_state() failed: %d\n",
-                       dp->index, err);
-               state->link = 0;
-       }
-}
-
 static struct phylink_pcs *
 dsa_port_phylink_mac_select_pcs(struct phylink_config *config,
                                phy_interface_t interface)
@@ -1646,17 +1625,6 @@ static int dsa_port_phylink_mac_finish(struct phylink_config *config,
        return err;
 }
 
-static void dsa_port_phylink_mac_an_restart(struct phylink_config *config)
-{
-       struct dsa_port *dp = container_of(config, struct dsa_port, pl_config);
-       struct dsa_switch *ds = dp->ds;
-
-       if (!ds->ops->phylink_mac_an_restart)
-               return;
-
-       ds->ops->phylink_mac_an_restart(ds, dp->index);
-}
-
 static void dsa_port_phylink_mac_link_down(struct phylink_config *config,
                                           unsigned int mode,
                                           phy_interface_t interface)
@@ -1700,11 +1668,9 @@ static void dsa_port_phylink_mac_link_up(struct phylink_config *config,
 static const struct phylink_mac_ops dsa_port_phylink_mac_ops = {
        .validate = dsa_port_phylink_validate,
        .mac_select_pcs = dsa_port_phylink_mac_select_pcs,
-       .mac_pcs_get_state = dsa_port_phylink_mac_pcs_get_state,
        .mac_prepare = dsa_port_phylink_mac_prepare,
        .mac_config = dsa_port_phylink_mac_config,
        .mac_finish = dsa_port_phylink_mac_finish,
-       .mac_an_restart = dsa_port_phylink_mac_an_restart,
        .mac_link_down = dsa_port_phylink_mac_link_down,
        .mac_link_up = dsa_port_phylink_mac_link_up,
 };
@@ -1720,13 +1686,6 @@ int dsa_port_phylink_create(struct dsa_port *dp)
        if (err)
                mode = PHY_INTERFACE_MODE_NA;
 
-       /* Presence of phylink_mac_link_state or phylink_mac_an_restart is
-        * an indicator of a legacy phylink driver.
-        */
-       if (ds->ops->phylink_mac_link_state ||
-           ds->ops->phylink_mac_an_restart)
-               dp->pl_config.legacy_pre_march2020 = true;
-
        if (ds->ops->phylink_get_caps)
                ds->ops->phylink_get_caps(ds, dp->index, &dp->pl_config);