net: stmmac: move xpcs clause 73 test into stmmac_init_phy()

We avoid binding a PHY if the XPCS is using clause 73 negotiation.
Rather than having this complexity in __stmmac_open(), move it to
stmmac_init_phy() instead. There is no point checking the XPCS
state this unless phylink wants a PHY, so place this appropriately.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Link: https://patch.msgid.link/E1v119o-0000000773y-21gs@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 517b25b2bcaed09e26ad70c7c5384e589429069b..3b47d4ca24cacbac686a941a2de399775316cc38 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1112,6 +1112,7 @@ static void stmmac_check_pcs_mode(struct stmmac_priv *priv)
 static int stmmac_init_phy(struct net_device *dev)
 {
        struct stmmac_priv *priv = netdev_priv(dev);
+       int mode = priv->plat->phy_interface;
        struct fwnode_handle *phy_fwnode;
        struct fwnode_handle *fwnode;
        int ret;
@@ -1119,6 +1120,10 @@ static int stmmac_init_phy(struct net_device *dev)
        if (!phylink_expects_phy(priv->phylink))
                return 0;
 
+       if (priv->hw->xpcs &&
+           xpcs_get_an_mode(priv->hw->xpcs, mode) == DW_AN_C73)
+               return 0;
+
        fwnode = priv->plat->port_node;
        if (!fwnode)
                fwnode = dev_fwnode(priv->device);
@@ -3926,7 +3931,6 @@ static int __stmmac_open(struct net_device *dev,
                         struct stmmac_dma_conf *dma_conf)
 {
        struct stmmac_priv *priv = netdev_priv(dev);
-       int mode = priv->plat->phy_interface;
        u32 chan;
        int ret;
 
@@ -3934,15 +3938,12 @@ static int __stmmac_open(struct net_device *dev,
        if (!priv->tx_lpi_timer)
                priv->tx_lpi_timer = eee_timer * 1000;
 
-       if ((!priv->hw->xpcs ||
-            xpcs_get_an_mode(priv->hw->xpcs, mode) != DW_AN_C73)) {
-               ret = stmmac_init_phy(dev);
-               if (ret) {
-                       netdev_err(priv->dev,
-                                  "%s: Cannot attach to PHY (error: %d)\n",
-                                  __func__, ret);
-                       return ret;
-               }
+       ret = stmmac_init_phy(dev);
+       if (ret) {
+               netdev_err(priv->dev,
+                          "%s: Cannot attach to PHY (error: %d)\n",
+                          __func__, ret);
+               return ret;
        }
 
        for (int i = 0; i < MTL_MAX_TX_QUEUES; i++)