| Message ID | 20230314070208.3703963-3-michael.wei.hong.sit@intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Fix PHY handle no longer parsing | expand |
On 14.03.23 08:02, Michael Sit Wei Hong wrote: > xpcs_an_inband value is updated in the speed_mode_2500 function > which turns on the xpcs_an_inband mode. > > Moving the fixed-link fixup code to right before phylink setup to > ensure no more fixup will affect the fixed-link mode configurations. > > Fixes: 72edaf39fc65 ("stmmac: intel: add phy-mode and fixed-link ACPI _DSD setting support") > Signed-off-by: Michael Sit Wei Hong <michael.wei.hong.sit@intel.com> Tested-by: Fabian Bläse <fabian@blaese.de>
On Tue, 14 Mar 2023 15:02:08 +0800 Michael Sit Wei Hong wrote: > xpcs_an_inband value is updated in the speed_mode_2500 function > which turns on the xpcs_an_inband mode. > > Moving the fixed-link fixup code to right before phylink setup to > ensure no more fixup will affect the fixed-link mode configurations. > > Fixes: 72edaf39fc65 ("stmmac: intel: add phy-mode and fixed-link ACPI _DSD setting support") > Signed-off-by: Michael Sit Wei Hong <michael.wei.hong.sit@intel.com> Ong Boon, since you added the code which gets moved - could we get an ack/review tag from you? Helps increase the confidence in the change.
On Tue, Mar 14, 2023 at 03:02:08PM +0800, Michael Sit Wei Hong wrote: > xpcs_an_inband value is updated in the speed_mode_2500 function > which turns on the xpcs_an_inband mode. > > Moving the fixed-link fixup code to right before phylink setup to > ensure no more fixup will affect the fixed-link mode configurations. Please could you explain why this is correct, when you could simple not set priv->plat->mdio_bus_data->xpcs_an_inband = true; in intel_speed_mode_2500()? This all seems like hacks, rather than a clean design. Andrew
> -----Original Message----- > From: Andrew Lunn <andrew@lunn.ch> > Sent: Saturday, March 18, 2023 4:03 AM > To: Sit, Michael Wei Hong <michael.wei.hong.sit@intel.com> > Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>; Alexandre > Torgue <alexandre.torgue@foss.st.com>; Jose Abreu > <joabreu@synopsys.com>; David S . Miller > <davem@davemloft.net>; Eric Dumazet > <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; > Paolo Abeni <pabeni@redhat.com>; Maxime Coquelin > <mcoquelin.stm32@gmail.com>; Ong, Boon Leong > <boon.leong.ong@intel.com>; netdev@vger.kernel.org; linux- > stm32@st-md-mailman.stormreply.com; linux-arm- > kernel@lists.infradead.org; linux-kernel@vger.kernel.org; Looi, > Hong Aun <hong.aun.looi@intel.com>; Voon, Weifeng > <weifeng.voon@intel.com>; Lai, Peter Jun Ann > <peter.jun.ann.lai@intel.com> > Subject: Re: [PATCH net v2 2/2] net: stmmac: move fixed-link > support fixup code > > On Tue, Mar 14, 2023 at 03:02:08PM +0800, Michael Sit Wei Hong > wrote: > > xpcs_an_inband value is updated in the speed_mode_2500 > function which > > turns on the xpcs_an_inband mode. > > > > Moving the fixed-link fixup code to right before phylink setup > to > > ensure no more fixup will affect the fixed-link mode > configurations. > > Please could you explain why this is correct, when you could > simple not set priv->plat->mdio_bus_data->xpcs_an_inband = > true; in intel_speed_mode_2500()? > > This all seems like hacks, rather than a clean design. > > Andrew Makes sense, will test out with your suggestion and submit the changes in next version, will feedback if there is any findings.
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c index 7deb1f817dac..d02db2b529b9 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c @@ -592,17 +592,6 @@ static int intel_mgbe_common_data(struct pci_dev *pdev, plat->mdio_bus_data->xpcs_an_inband = true; } - /* For fixed-link setup, we clear xpcs_an_inband */ - if (fwnode) { - struct fwnode_handle *fixed_node; - - fixed_node = fwnode_get_named_child_node(fwnode, "fixed-link"); - if (fixed_node) - plat->mdio_bus_data->xpcs_an_inband = false; - - fwnode_handle_put(fixed_node); - } - /* Ensure mdio bus scan skips intel serdes and pcs-xpcs */ plat->mdio_bus_data->phy_mask = 1 << INTEL_MGBE_ADHOC_ADDR; plat->mdio_bus_data->phy_mask |= 1 << INTEL_MGBE_XPCS_ADDR; diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 398adcd68ee8..6560aed95036 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -7064,6 +7064,7 @@ int stmmac_dvr_probe(struct device *device, struct stmmac_resources *res) { struct net_device *ndev = NULL; + struct fwnode_handle *fwnode; struct stmmac_priv *priv; u32 rxq; int i, ret = 0; @@ -7306,6 +7307,21 @@ int stmmac_dvr_probe(struct device *device, goto error_xpcs_setup; } + /* For fixed-link setup, we clear xpcs_an_inband */ + fwnode = of_fwnode_handle(priv->plat->phylink_node); + if (!fwnode) + fwnode = dev_fwnode(priv->device); + + if (fwnode) { + struct fwnode_handle *fixed_node; + + fixed_node = fwnode_get_named_child_node(fwnode, "fixed-link"); + if (fixed_node) + priv->plat->mdio_bus_data->xpcs_an_inband = false; + + fwnode_handle_put(fixed_node); + } + ret = stmmac_phy_setup(priv); if (ret) { netdev_err(ndev, "failed to setup phy (%d)\n", ret);
xpcs_an_inband value is updated in the speed_mode_2500 function which turns on the xpcs_an_inband mode. Moving the fixed-link fixup code to right before phylink setup to ensure no more fixup will affect the fixed-link mode configurations. Fixes: 72edaf39fc65 ("stmmac: intel: add phy-mode and fixed-link ACPI _DSD setting support") Signed-off-by: Michael Sit Wei Hong <michael.wei.hong.sit@intel.com> --- .../net/ethernet/stmicro/stmmac/dwmac-intel.c | 11 ----------- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 11 deletions(-)