net: mvneta: implement pcs_inband_caps() method

Report the PCS in-band capabilities to phylink for Marvell NETA
interfaces.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1tIUs9-006IUb-Au@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index 1fb285fa0bdb7dda03738a0ed3bd49dee8877608..fe6261b8154090311495f6feae3d167bff654915 100644 (file)
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -3960,20 +3960,27 @@ static struct mvneta_port *mvneta_pcs_to_port(struct phylink_pcs *pcs)
        return container_of(pcs, struct mvneta_port, phylink_pcs);
 }
 
-static int mvneta_pcs_validate(struct phylink_pcs *pcs,
-                              unsigned long *supported,
-                              const struct phylink_link_state *state)
+static unsigned int mvneta_pcs_inband_caps(struct phylink_pcs *pcs,
+                                          phy_interface_t interface)
 {
-       /* We only support QSGMII, SGMII, 802.3z and RGMII modes.
-        * When in 802.3z mode, we must have AN enabled:
+       /* When operating in an 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."
+        * Therefore, inband is "required".
         */
-       if (phy_interface_mode_is_8023z(state->interface) &&
-           !phylink_test(state->advertising, Autoneg))
-               return -EINVAL;
+       if (phy_interface_mode_is_8023z(interface))
+               return LINK_INBAND_ENABLE;
 
-       return 0;
+       /* QSGMII, SGMII and RGMII can be configured to use inband
+        * signalling of the AN result. Indicate these as "possible".
+        */
+       if (interface == PHY_INTERFACE_MODE_SGMII ||
+           interface == PHY_INTERFACE_MODE_QSGMII ||
+           phy_interface_mode_is_rgmii(interface))
+               return LINK_INBAND_DISABLE | LINK_INBAND_ENABLE;
+
+       /* For any other modes, indicate that inband is not supported. */
+       return LINK_INBAND_DISABLE;
 }
 
 static void mvneta_pcs_get_state(struct phylink_pcs *pcs,
@@ -4071,7 +4078,7 @@ static void mvneta_pcs_an_restart(struct phylink_pcs *pcs)
 }
 
 static const struct phylink_pcs_ops mvneta_phylink_pcs_ops = {
-       .pcs_validate = mvneta_pcs_validate,
+       .pcs_inband_caps = mvneta_pcs_inband_caps,
        .pcs_get_state = mvneta_pcs_get_state,
        .pcs_config = mvneta_pcs_config,
        .pcs_an_restart = mvneta_pcs_an_restart,