net: stmmac: use PCS supported_interfaces

Use the PCS' supported_interfaces member to build the MAC level
supported_interfaces bitmap.

Reviewed-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1tTfff-007Roc-Ff@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 99eaec8bac4a9acd882a7cffc2ee4ca5edeb12b4..2f518ec845ecffbc8b4c00aaa972b716671c4303 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1203,6 +1203,7 @@ static int stmmac_phy_setup(struct stmmac_priv *priv)
        struct stmmac_mdio_bus_data *mdio_bus_data;
        int mode = priv->plat->phy_interface;
        struct fwnode_handle *fwnode;
+       struct phylink_pcs *pcs;
        struct phylink *phylink;
 
        priv->phylink_config.dev = &priv->dev->dev;
@@ -1224,8 +1225,14 @@ static int stmmac_phy_setup(struct stmmac_priv *priv)
 
        /* If we have an xpcs, it defines which PHY interfaces are supported. */
        if (priv->hw->xpcs)
-               xpcs_get_interfaces(priv->hw->xpcs,
-                                   priv->phylink_config.supported_interfaces);
+               pcs = xpcs_to_phylink_pcs(priv->hw->xpcs);
+       else
+               pcs = priv->hw->phylink_pcs;
+
+       if (pcs)
+               phy_interface_or(priv->phylink_config.supported_interfaces,
+                                priv->phylink_config.supported_interfaces,
+                                pcs->supported_interfaces);
 
        fwnode = priv->plat->port_node;
        if (!fwnode)