net: stmmac: introduce pcs_init/pcs_exit stmmac operations

Introduce a mechanism whereby platforms can create their PCS instances
prior to the network device being published to userspace, but after
some of the core stmmac initialisation has been completed. This means
that the data structures that platforms need will be available.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Reviewed-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: Hariprasad Kelam <hkelam@marvell.com>
Link: https://lore.kernel.org/r/20240513-rzn1-gmac1-v7-4-6acf58b5440d@bootlin.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index 54708440e27b8b82032a0f4a72e08f757e68d97b..aa43117134d380d4dee2ddce73dda4cf2ddda241 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
@@ -505,7 +505,10 @@ int stmmac_pcs_setup(struct net_device *ndev)
        priv = netdev_priv(ndev);
        mode = priv->plat->phy_interface;
 
-       if (priv->plat->mdio_bus_data && priv->plat->mdio_bus_data->has_xpcs) {
+       if (priv->plat->pcs_init) {
+               ret = priv->plat->pcs_init(priv);
+       } else 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);
@@ -533,6 +536,9 @@ void stmmac_pcs_clean(struct net_device *ndev)
 {
        struct stmmac_priv *priv = netdev_priv(ndev);
 
+       if (priv->plat->pcs_exit)
+               priv->plat->pcs_exit(priv);
+
        if (!priv->hw->xpcs)
                return;
 

diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index dfa1828cd756abe4cef3c122012bf51790211752..4a24a246c617d079c48fe23f7cb857e79f01b0fb 100644 (file)
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -285,6 +285,8 @@ struct plat_stmmacenet_data {
        int (*crosststamp)(ktime_t *device, struct system_counterval_t *system,
                           void *ctx);
        void (*dump_debug_regs)(void *priv);
+       int (*pcs_init)(struct stmmac_priv *priv);
+       void (*pcs_exit)(struct stmmac_priv *priv);
        void *bsp_priv;
        struct clk *stmmac_clk;
        struct clk *pclk;