diff mbox series

[net-next,v7,3/7] net: stmmac: Make stmmac_xpcs_setup() generic to all PCS devices

Message ID 20240513-rzn1-gmac1-v7-3-6acf58b5440d@bootlin.com (mailing list archive)
State Accepted
Commit f9cdff1bdacc947bcd182ea69d94b9f5b32ff328
Delegated to: Netdev Maintainers
Headers show
Series net: stmmac: Add support for RZN1 GMAC devices | expand

Checks

Context Check Description
netdev/series_format success Posting correctly formatted
netdev/tree_selection success Clearly marked for net-next
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 934 this patch: 934
netdev/build_tools success No tools touched, skip
netdev/cc_maintainers success CCed 10 of 10 maintainers
netdev/build_clang success Errors and warnings before: 936 this patch: 936
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 946 this patch: 946
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 79 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 59 this patch: 59
netdev/source_inline success Was 0 now: 0
netdev/contest success net-next-2024-05-14--00-00 (tests: 1022)

Commit Message

Romain Gantois May 13, 2024, 7:25 a.m. UTC 
From: Serge Semin <fancer.lancer@gmail.com>

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>
---
 drivers/net/ethernet/stmicro/stmmac/stmmac.h      |  2 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 10 +++-----
 drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 30 ++++++++++++++---------
 3 files changed, 23 insertions(+), 19 deletions(-)

Comments

Hariprasad Kelam May 13, 2024, 10:20 a.m. UTC | #1 
> From: Serge Semin <fancer.lancer@gmail.com>
> 
> 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>
> ---
>  drivers/net/ethernet/stmicro/stmmac/stmmac.h      |  2 +-
>  drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 10 +++-----
> drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 30 ++++++++++++++-
> --------
>  3 files changed, 23 insertions(+), 19 deletions(-)
> 
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
> b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
> index badfe686a5702..ed38099ca7406 100644
> --- 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 0ac99c132733d..ef285b3c56ab9 100644
> --- 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 @@ 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);
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
> b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
> index 73ba9901a4439..54708440e27b8 100644
> --- 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;
>  }
> 
> 
> --
> 2.44.0
> 
Reviewed-by: Hariprasad Kelam <hkelam@marvell.com>
Serge Semin May 13, 2024, 11:18 a.m. UTC | #2 
On Mon, May 13, 2024 at 09:25:14AM +0200, Romain Gantois wrote:
> From: Serge Semin <fancer.lancer@gmail.com>
> 
> 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>

Looking good. Thanks.

-Serge(y)

> ---
>  drivers/net/ethernet/stmicro/stmmac/stmmac.h      |  2 +-
>  drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 10 +++-----
>  drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 30 ++++++++++++++---------
>  3 files changed, 23 insertions(+), 19 deletions(-)
> 
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
> index badfe686a5702..ed38099ca7406 100644
> --- 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 0ac99c132733d..ef285b3c56ab9 100644
> --- 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 @@ 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);
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
> index 73ba9901a4439..54708440e27b8 100644
> --- 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;
>  }
>  
> 
> -- 
> 2.44.0
>
diff mbox series

Patch

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
index badfe686a5702..ed38099ca7406 100644
--- 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 0ac99c132733d..ef285b3c56ab9 100644
--- 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 @@  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);
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index 73ba9901a4439..54708440e27b8 100644
--- 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;
 }