net: mvpp2: convert to pcs_validate() and phylink_generic_validate()

Convert mvpp2 to validate the autoneg state for 1000base-X in the
pcs_validate() operation, rather than the MAC validate() operation.
This allows us to switch the MAC validate() to use
phylink_generic_validate().

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/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index 4424ac440cc6fd7bdb0b8b05f095ae963e167f35..339ae274021e72c36ce6eb945e869dcd91c00ef6 100644 (file)
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -6163,6 +6163,21 @@ static const struct phylink_pcs_ops mvpp2_phylink_xlg_pcs_ops = {
        .pcs_config = mvpp2_xlg_pcs_config,
 };
 
+static int mvpp2_gmac_pcs_validate(struct phylink_pcs *pcs,
+                                  unsigned long *supported,
+                                  const struct phylink_link_state *state)
+{
+       /* When in 802.3z mode, we must have AN enabled:
+        * Bit 2 Field InBandAnEn In-band Auto-Negotiation enable. ...
+        * When <PortType> = 1 (1000BASE-X) this field must be set to 1.
+        */
+       if (phy_interface_mode_is_8023z(state->interface) &&
+           !phylink_test(state->advertising, Autoneg))
+               return -EINVAL;
+
+       return 0;
+}
+
 static void mvpp2_gmac_pcs_get_state(struct phylink_pcs *pcs,
                                     struct phylink_link_state *state)
 {
@@ -6267,30 +6282,12 @@ static void mvpp2_gmac_pcs_an_restart(struct phylink_pcs *pcs)
 }
 
 static const struct phylink_pcs_ops mvpp2_phylink_gmac_pcs_ops = {
+       .pcs_validate = mvpp2_gmac_pcs_validate,
        .pcs_get_state = mvpp2_gmac_pcs_get_state,
        .pcs_config = mvpp2_gmac_pcs_config,
        .pcs_an_restart = mvpp2_gmac_pcs_an_restart,
 };
 
-static void mvpp2_phylink_validate(struct phylink_config *config,
-                                  unsigned long *supported,
-                                  struct phylink_link_state *state)
-{
-       /* When in 802.3z mode, we must have AN enabled:
-        * Bit 2 Field InBandAnEn In-band Auto-Negotiation enable. ...
-        * When <PortType> = 1 (1000BASE-X) this field must be set to 1.
-        */
-       if (phy_interface_mode_is_8023z(state->interface) &&
-           !phylink_test(state->advertising, Autoneg))
-               goto empty_set;
-
-       phylink_generic_validate(config, supported, state);
-       return;
-
-empty_set:
-       linkmode_zero(supported);
-}
-
 static void mvpp2_xlg_config(struct mvpp2_port *port, unsigned int mode,
                             const struct phylink_link_state *state)
 {
@@ -6608,7 +6605,7 @@ static void mvpp2_mac_link_down(struct phylink_config *config,
 }
 
 static const struct phylink_mac_ops mvpp2_phylink_ops = {
-       .validate = mvpp2_phylink_validate,
+       .validate = phylink_generic_validate,
        .mac_select_pcs = mvpp2_select_pcs,
        .mac_prepare = mvpp2_mac_prepare,
        .mac_config = mvpp2_mac_config,