Thread (12 messages) flat view 12 messages, 4 authors, 2021-06-04

RE: [RESEND PATCH net-next v4 1/3] net: stmmac: split xPCS setup from mdio register

From: Sit, Michael Wei Hong <hidden>
Date: 2021-06-03 13:50:08
Also in: lkml, netdev 

Hi Vladimir,

-----Original Message-----
From: Vladimir Oltean <olteanv@gmail.com>
Sent: Thursday, June 3, 2021 9:21 PM
To: Sit, Michael Wei Hong <redacted>
Cc: Jose.Abreu@synopsys.com; andrew@lunn.ch;
hkallweit1@gmail.com; linux@armlinux.org.uk; kuba@kernel.org;
netdev@vger.kernel.org; peppe.cavallaro@st.com;
alexandre.torgue@foss.st.com; davem@davemloft.net;
mcoquelin.stm32@gmail.com; Voon, Weifeng
[off-list ref]; Ong, Boon Leong
[off-list ref]; Tan, Tee Min
[off-list ref]; vee.khee.wong@linux.intel.com;
Wong, Vee Khee [off-list ref]; linux-stm32@st-
md-mailman.stormreply.com; linux-arm-
kernel@lists.infradead.org; linux-kernel@vger.kernel.org
Subject: Re: [RESEND PATCH net-next v4 1/3] net: stmmac: split
xPCS setup from mdio register

Hi Michael,

On Thu, Jun 03, 2021 at 07:50:30PM +0800, Michael Sit Wei Hong
wrote:
quoted
From: Voon Weifeng <redacted>

This patch is a preparation patch for the enabling of Intel mGbE
2.5Gbps link speed. The Intel mGbR link speed configuration
(1G/2.5G)
quoted
is depends on a mdio ADHOC register which can be configured
in the bios menu.
quoted
As PHY interface might be different for 1G and 2.5G, the mdio
bus need
quoted
be ready to check the link speed and select the PHY interface
before
quoted
probing the xPCS.

Signed-off-by: Voon Weifeng <redacted>
Signed-off-by: Michael Sit Wei Hong
[off-list ref]
quoted
---
 drivers/net/ethernet/stmicro/stmmac/stmmac.h  |  1 +
.../net/ethernet/stmicro/stmmac/stmmac_main.c |  7 ++
.../net/ethernet/stmicro/stmmac/stmmac_mdio.c | 73
++++++++++---------
quoted
 3 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
index b6cd43eda7ac..fd7212afc543 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
@@ -311,6 +311,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);
 void stmmac_set_ethtool_ops(struct net_device *netdev);

 void stmmac_ptp_register(struct stmmac_priv *priv); diff --git
a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 13720bf6f6ff..eb81baeb13b0 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -7002,6 +7002,12 @@ int stmmac_dvr_probe(struct device
*device,
quoted
 		}
 	}

+	if (priv->plat->mdio_bus_data->has_xpcs) {
+		ret = stmmac_xpcs_setup(priv->mii);
+		if (ret)
+			goto error_xpcs_setup;
+	}
+
I don't understand why this change is necessary?

The XPCS probing code was at the end of
stmmac_mdio_register().
You moved the code right _after_ stmmac_mdio_register().
So the code flow is exactly the same.
Yes, the code flow may look the same, but for intel platforms,
we need to read the mdio ADHOC register to determine the link speed
that is set in the BIOS, after reading the mdio ADHOC register value,
we can determine the link speed and set the appropriate phy_interface
for 1G/2.5G, where 2.5G uses the PHY_INTERFACE_MODE_2500BASEX
and 1G uses the PHY_INTERFACE_MODE_SGMII.

The register reading function is added in between the mdio_register and
xpcs_setup in patch 3 of the series
quoted
 	ret = stmmac_phy_setup(priv);
 	if (ret) {
 		netdev_err(ndev, "failed to setup phy (%d)\n",
ret); @@ -7038,6
quoted
+7044,7 @@ int stmmac_dvr_probe(struct device *device,
 	unregister_netdev(ndev);
 error_netdev_register:
 	phylink_destroy(priv->phylink);
+error_xpcs_setup:
 error_phy_setup:
 	if (priv->hw->pcs != STMMAC_PCS_TBI &&
 	    priv->hw->pcs != STMMAC_PCS_RTBI) diff --git
a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index e293bf1ce9f3..3bb0a787f136 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
@@ -397,6 +397,44 @@ int stmmac_mdio_reset(struct mii_bus
*bus)
quoted
 	return 0;
 }

+int stmmac_xpcs_setup(struct mii_bus *bus) {
+	int mode, max_addr, addr, found, ret;
+	struct net_device *ndev = bus->priv;
+	struct mdio_xpcs_args *xpcs;
+	struct stmmac_priv *priv;
+
+	priv = netdev_priv(ndev);
+	xpcs = &priv->hw->xpcs_args;
+	mode = priv->plat->phy_interface;
+	max_addr = PHY_MAX_ADDR;
+
+	priv->hw->xpcs = mdio_xpcs_get_ops();
+	if (!priv->hw->xpcs)
+		return -ENODEV;
+
+	/* Try to probe the XPCS by scanning all addresses. */
+	xpcs->bus = bus;
+	found = 0;
+
+	for (addr = 0; addr < max_addr; addr++) {
+		xpcs->addr = addr;
+
+		ret = stmmac_xpcs_probe(priv, xpcs, mode);
+		if (!ret) {
+			found = 1;
+			break;
+		}
+	}
+
+	if (!found) {
+		dev_warn(priv->device, "No xPCS found\n");
+		return -ENODEV;
+	}
+
+	return ret;
+}
+
 /**
  * stmmac_mdio_register
  * @ndev: net device structure
@@ -444,14 +482,6 @@ int stmmac_mdio_register(struct
net_device *ndev)
quoted
 		max_addr = PHY_MAX_ADDR;
 	}

-	if (mdio_bus_data->has_xpcs) {
-		priv->hw->xpcs = mdio_xpcs_get_ops();
-		if (!priv->hw->xpcs) {
-			err = -ENODEV;
-			goto bus_register_fail;
-		}
-	}
-
 	if (mdio_bus_data->needs_reset)
 		new_bus->reset = &stmmac_mdio_reset;

@@ -509,38 +539,11 @@ int stmmac_mdio_register(struct
net_device *ndev)
quoted
 		goto no_phy_found;
 	}

-	/* Try to probe the XPCS by scanning all addresses. */
-	if (priv->hw->xpcs) {
-		struct mdio_xpcs_args *xpcs = &priv->hw-
xpcs_args;
-		int ret, mode = priv->plat->phy_interface;
-		max_addr = PHY_MAX_ADDR;
-
-		xpcs->bus = new_bus;
-
-		found = 0;
-		for (addr = 0; addr < max_addr; addr++) {
-			xpcs->addr = addr;
-
-			ret = stmmac_xpcs_probe(priv, xpcs,
mode);
quoted
-			if (!ret) {
-				found = 1;
-				break;
-			}
-		}
-
-		if (!found && !mdio_node) {
-			dev_warn(dev, "No XPCS found\n");
-			err = -ENODEV;
-			goto no_xpcs_found;
-		}
-	}
-
 bus_register_done:
 	priv->mii = new_bus;

 	return 0;

-no_xpcs_found:
 no_phy_found:
 	mdiobus_unregister(new_bus);
 bus_register_fail:
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help