| Message ID | 20220124095951.23845-3-mohammad.athari.ismail@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fix PTP issue in stmmac | expand |
> @@ -3308,13 +3309,11 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp) > > stmmac_mmc_setup(priv); > > - if (init_ptp) { > - ret = stmmac_init_ptp(priv); > - if (ret == -EOPNOTSUPP) > - netdev_warn(priv->dev, "PTP not supported by HW\n"); > - else if (ret) > - netdev_warn(priv->dev, "PTP init failed\n"); > - } > + ret = stmmac_init_ptp(priv, ptp_register); > + if (ret == -EOPNOTSUPP) > + netdev_warn(priv->dev, "PTP not supported by HW\n"); > + else if (ret) > + netdev_warn(priv->dev, "PTP init failed\n"); The init_ptp parameter now seems unused? If so, please remove it. Andrew
> -----Original Message----- > From: Andrew Lunn <andrew@lunn.ch> > Sent: Monday, January 24, 2022 9:15 PM > To: Ismail, Mohammad Athari <mohammad.athari.ismail@intel.com> > Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>; Alexandre Torgue > <alexandre.torgue@st.com>; Jose Abreu <joabreu@synopsys.com>; David > S . Miller <davem@davemloft.net>; Jakub Kicinski <kuba@kernel.org>; > Maxime Coquelin <mcoquelin.stm32@gmail.com>; Ong, Boon Leong > <boon.leong.ong@intel.com>; Voon, Weifeng <weifeng.voon@intel.com>; > Wong, Vee Khee <vee.khee.wong@intel.com>; Huacai Chen > <chenhuacai@kernel.org>; netdev@vger.kernel.org; linux-stm32@st-md- > mailman.stormreply.com; linux-arm-kernel@lists.infradead.org; linux- > kernel@vger.kernel.org > Subject: Re: [PATCH net 2/2] net: stmmac: skip only stmmac_ptp_register > when resume from suspend > > > @@ -3308,13 +3309,11 @@ static int stmmac_hw_setup(struct net_device > *dev, bool init_ptp) > > > > stmmac_mmc_setup(priv); > > > > - if (init_ptp) { > > - ret = stmmac_init_ptp(priv); > > - if (ret == -EOPNOTSUPP) > > - netdev_warn(priv->dev, "PTP not supported by > HW\n"); > > - else if (ret) > > - netdev_warn(priv->dev, "PTP init failed\n"); > > - } > > + ret = stmmac_init_ptp(priv, ptp_register); > > + if (ret == -EOPNOTSUPP) > > + netdev_warn(priv->dev, "PTP not supported by HW\n"); > > + else if (ret) > > + netdev_warn(priv->dev, "PTP init failed\n"); > > The init_ptp parameter now seems unused? If so, please remove it. I believe you miss below diff. It is renamed to ptp_register. -static int stmmac_hw_setup(struct net_device *dev, bool init_ptp) +static int stmmac_hw_setup(struct net_device *dev, bool ptp_register) { struct stmmac_priv *priv = netdev_priv(dev); There are build warnings as below. I'll fix it in v2. ../drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:888: warning: Function parameter or member 'ptp_register' not described in 'stmmac_init_ptp' ../drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:3256: warning: Excess function parameter 'init_ptp' description in 'stmmac_hw_setup Thanks -Athari- > > Andrew
> > > @@ -3308,13 +3309,11 @@ static int stmmac_hw_setup(struct net_device > > *dev, bool init_ptp) ... > > The init_ptp parameter now seems unused? If so, please remove it. > > I believe you miss below diff. It is renamed to ptp_register. Ah, yes, sorry. I was looking at the context information diff gives you, which still has the old name. Andrew
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index d7e261768f73..cfea38a50a73 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -884,7 +884,7 @@ EXPORT_SYMBOL_GPL(stmmac_init_tstamp_counter); * This is done by looking at the HW cap. register. * This function also registers the ptp driver. */ -static int stmmac_init_ptp(struct stmmac_priv *priv) +static int stmmac_init_ptp(struct stmmac_priv *priv, bool ptp_register) { bool xmac = priv->plat->has_gmac4 || priv->plat->has_xgmac; int ret; @@ -914,7 +914,8 @@ static int stmmac_init_ptp(struct stmmac_priv *priv) priv->hwts_tx_en = 0; priv->hwts_rx_en = 0; - stmmac_ptp_register(priv); + if (ptp_register) + stmmac_ptp_register(priv); return 0; } @@ -3251,7 +3252,7 @@ static int stmmac_fpe_start_wq(struct stmmac_priv *priv) * 0 on success and an appropriate (-)ve integer as defined in errno.h * file on failure. */ -static int stmmac_hw_setup(struct net_device *dev, bool init_ptp) +static int stmmac_hw_setup(struct net_device *dev, bool ptp_register) { struct stmmac_priv *priv = netdev_priv(dev); u32 rx_cnt = priv->plat->rx_queues_to_use; @@ -3308,13 +3309,11 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp) stmmac_mmc_setup(priv); - if (init_ptp) { - ret = stmmac_init_ptp(priv); - if (ret == -EOPNOTSUPP) - netdev_warn(priv->dev, "PTP not supported by HW\n"); - else if (ret) - netdev_warn(priv->dev, "PTP init failed\n"); - } + ret = stmmac_init_ptp(priv, ptp_register); + if (ret == -EOPNOTSUPP) + netdev_warn(priv->dev, "PTP not supported by HW\n"); + else if (ret) + netdev_warn(priv->dev, "PTP init failed\n"); priv->eee_tw_timer = STMMAC_DEFAULT_TWT_LS;
When resume from suspend, besides skipping PTP registration, it also skipping PTP HW initialization. This could cause PTP clock not able to operate properly when resume from suspend. To fix this, only stmmac_ptp_register() is skipped when resume from suspend. Fixes: fe1319291150 ("stmmac: Don't init ptp again when resume from suspend/hibernation") Cc: <stable@vger.kernel.org> # 5.15.x Signed-off-by: Mohammad Athari Bin Ismail <mohammad.athari.ismail@intel.com> --- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)