net: stmmac: Make stmmac_xpcs_setup() generic to all PCS devices

A pcs_init() callback will be introduced to stmmac in a future patch. This
new function will be called during the hardware initialization phase.
Instead of separately initializing XPCS and PCS components, let's group all
PCS-related hardware initialization logic in the current
stmmac_xpcs_setup() function.

Rename stmmac_xpcs_setup() to stmmac_pcs_setup() and move the conditional
call to stmmac_xpcs_setup() inside the function itself.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
Co-developed-by: Romain Gantois <romain.gantois@bootlin.com>
Signed-off-by: Romain Gantois <romain.gantois@bootlin.com>
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Hariprasad Kelam <hkelam@marvell.com>
Link: https://lore.kernel.org/r/20240513-rzn1-gmac1-v7-3-6acf58b5440d@bootlin.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
index badfe686a5702c48e3a0ab72f21145101c11364a..ed38099ca7406a24813b3e4441f2f3835e6b68ae 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
@@ -360,7 +360,7 @@ enum stmmac_state {
 int stmmac_mdio_unregister(struct net_device *ndev);
 int stmmac_mdio_register(struct net_device *ndev);
 int stmmac_mdio_reset(struct mii_bus *mii);
-int stmmac_xpcs_setup(struct mii_bus *mii);
+int stmmac_pcs_setup(struct net_device *ndev);
 void stmmac_pcs_clean(struct net_device *ndev);
 void stmmac_set_ethtool_ops(struct net_device *netdev);
 

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 0ac99c132733d4e9eb4eee34790b308c0633ef0c..ef285b3c56ab9f4048acca879429c51344ed22cf 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -7754,11 +7754,9 @@ int stmmac_dvr_probe(struct device *device,
        if (priv->plat->speed_mode_2500)
                priv->plat->speed_mode_2500(ndev, priv->plat->bsp_priv);
 
-       if (priv->plat->mdio_bus_data && priv->plat->mdio_bus_data->has_xpcs) {
-               ret = stmmac_xpcs_setup(priv->mii);
-               if (ret)
-                       goto error_xpcs_setup;
-       }
+       ret = stmmac_pcs_setup(ndev);
+       if (ret)
+               goto error_pcs_setup;
 
        ret = stmmac_phy_setup(priv);
        if (ret) {
@@ -7791,7 +7789,7 @@ error_netdev_register:
        phylink_destroy(priv->phylink);
 error_phy_setup:
        stmmac_pcs_clean(ndev);
-error_xpcs_setup:
+error_pcs_setup:
        if (priv->hw->pcs != STMMAC_PCS_TBI &&
            priv->hw->pcs != STMMAC_PCS_RTBI)
                stmmac_mdio_unregister(ndev);

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index 73ba9901a4439e3e97d526adf7ecfb11edbda42f..54708440e27b8b82032a0f4a72e08f757e68d97b 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
@@ -495,31 +495,37 @@ int stmmac_mdio_reset(struct mii_bus *bus)
        return 0;
 }
 
-int stmmac_xpcs_setup(struct mii_bus *bus)
+int stmmac_pcs_setup(struct net_device *ndev)
 {
-       struct net_device *ndev = bus->priv;
+       struct dw_xpcs *xpcs = NULL;
        struct stmmac_priv *priv;
-       struct dw_xpcs *xpcs;
+       int ret = -ENODEV;
        int mode, addr;
 
        priv = netdev_priv(ndev);
        mode = priv->plat->phy_interface;
 
-       /* Try to probe the XPCS by scanning all addresses. */
-       for (addr = 0; addr < PHY_MAX_ADDR; addr++) {
-               xpcs = xpcs_create_mdiodev(bus, addr, mode);
-               if (IS_ERR(xpcs))
-                       continue;
+       if (priv->plat->mdio_bus_data && priv->plat->mdio_bus_data->has_xpcs) {
+               /* Try to probe the XPCS by scanning all addresses */
+               for (addr = 0; addr < PHY_MAX_ADDR; addr++) {
+                       xpcs = xpcs_create_mdiodev(priv->mii, addr, mode);
+                       if (IS_ERR(xpcs))
+                               continue;
 
-               priv->hw->xpcs = xpcs;
-               break;
+                       ret = 0;
+                       break;
+               }
+       } else {
+               return 0;
        }
 
-       if (!priv->hw->xpcs) {
+       if (ret) {
                dev_warn(priv->device, "No xPCS found\n");
-               return -ENODEV;
+               return ret;
        }
 
+       priv->hw->xpcs = xpcs;
+
        return 0;
 }