Commit f9cdff1b authored by Serge Semin's avatar Serge Semin Committed by Jakub Kicinski
Browse files

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: default avatarSerge Semin <fancer.lancer@gmail.com>
Co-developed-by: default avatarRomain Gantois <romain.gantois@bootlin.com>
Signed-off-by: default avatarRomain Gantois <romain.gantois@bootlin.com>
Reviewed-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarHariprasad Kelam <hkelam@marvell.com>
Link: https://lore.kernel.org/r/20240513-rzn1-gmac1-v7-3-6acf58b5440d@bootlin.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d5c50937

drivers/net/ethernet/stmicro/stmmac/stmmac.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+4 −6
Original line number Diff line number Diff line
@@ -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);

	ret = stmmac_pcs_setup(ndev);

	if (ret)

			goto error_xpcs_setup;

	}

		goto error_pcs_setup;



	ret = stmmac_phy_setup(priv);

	if (ret) {
@@ -7791,7 +7789,7 @@ int stmmac_dvr_probe(struct device *device, 
	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);

drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c

+18 −12
Original line number Diff line number Diff line
@@ -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. */

	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(bus, addr, mode);

			xpcs = xpcs_create_mdiodev(priv->mii, addr, mode);

			if (IS_ERR(xpcs))

				continue;



		priv->hw->xpcs = xpcs;

			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;

}