net: mvpp2: implement pcs_inband_caps() method

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

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

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index 571631a3032024f5f34f0d09d36ff76a0ae0e8c7..f85229a3084419124b49f4b0aa76751d04b91021 100644 (file)
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -6224,19 +6224,26 @@ 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)
+static unsigned int mvpp2_gmac_pcs_inband_caps(struct phylink_pcs *pcs,
+                                              phy_interface_t interface)
 {
-       /* 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;
+       /* SGMII and RGMII can be configured to use inband signalling of the
+        * AN result. Indicate these as "possible".
+        */
+       if (interface == PHY_INTERFACE_MODE_SGMII ||
+           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 mvpp2_gmac_pcs_get_state(struct phylink_pcs *pcs,
@@ -6343,7 +6350,7 @@ 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_inband_caps = mvpp2_gmac_pcs_inband_caps,
        .pcs_get_state = mvpp2_gmac_pcs_get_state,
        .pcs_config = mvpp2_gmac_pcs_config,
        .pcs_an_restart = mvpp2_gmac_pcs_an_restart,