| Message ID | 20240807080956.2556602-1-csokas.bence@prolan.hu (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8fee6d5ad5fa18c270eedb2a2cdf58dbadefb94b |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [resubmit,net] net: fec: Stop PPS on driver remove | expand |
On Wed, Aug 07, 2024 at 10:09:56AM +0200, Csókás, Bence wrote: > PPS was not stopped in `fec_ptp_stop()`, called when > the adapter was removed. Consequentially, you couldn't > safely reload the driver with the PPS signal on. > > Fixes: 32cba57ba74b ("net: fec: introduce fec_ptp_stop and use in probe fail path") > > Reviewed-by: Fabio Estevam <festevam@gmail.com> > Link: https://lore.kernel.org/netdev/CAOMZO5BzcZR8PwKKwBssQq_wAGzVgf1ffwe_nhpQJjviTdxy-w@mail.gmail.com/T/#m01dcb810bfc451a492140f6797ca77443d0cb79f > Signed-off-by: Csókás, Bence <csokas.bence@prolan.hu> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
On Wed, Aug 07, 2024 at 10:09:56AM +0200, Csókás, Bence wrote: > PPS was not stopped in `fec_ptp_stop()`, called when > the adapter was removed. Consequentially, you couldn't > safely reload the driver with the PPS signal on. > > Fixes: 32cba57ba74b ("net: fec: introduce fec_ptp_stop and use in probe fail path") > > Reviewed-by: Fabio Estevam <festevam@gmail.com> > Link: https://lore.kernel.org/netdev/CAOMZO5BzcZR8PwKKwBssQq_wAGzVgf1ffwe_nhpQJjviTdxy-w@mail.gmail.com/T/#m01dcb810bfc451a492140f6797ca77443d0cb79f > Signed-off-by: Csókás, Bence <csokas.bence@prolan.hu> Reviewed-by: Frank Li <Frank.Li@nxp.com> > --- > drivers/net/ethernet/freescale/fec_ptp.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c > index e32f6724f568..2e4f3e1782a2 100644 > --- a/drivers/net/ethernet/freescale/fec_ptp.c > +++ b/drivers/net/ethernet/freescale/fec_ptp.c > @@ -775,6 +775,9 @@ void fec_ptp_stop(struct platform_device *pdev) > struct net_device *ndev = platform_get_drvdata(pdev); > struct fec_enet_private *fep = netdev_priv(ndev); > > + if (fep->pps_enable) > + fec_ptp_enable_pps(fep, 0); > + > cancel_delayed_work_sync(&fep->time_keep); > hrtimer_cancel(&fep->perout_timer); > if (fep->ptp_clock) > -- > 2.34.1 > >
Hello: This patch was applied to netdev/net.git (main) by Jakub Kicinski <kuba@kernel.org>: On Wed, 7 Aug 2024 10:09:56 +0200 you wrote: > PPS was not stopped in `fec_ptp_stop()`, called when > the adapter was removed. Consequentially, you couldn't > safely reload the driver with the PPS signal on. > > Fixes: 32cba57ba74b ("net: fec: introduce fec_ptp_stop and use in probe fail path") > > Reviewed-by: Fabio Estevam <festevam@gmail.com> > Link: https://lore.kernel.org/netdev/CAOMZO5BzcZR8PwKKwBssQq_wAGzVgf1ffwe_nhpQJjviTdxy-w@mail.gmail.com/T/#m01dcb810bfc451a492140f6797ca77443d0cb79f > Signed-off-by: Csókás, Bence <csokas.bence@prolan.hu> > > [...] Here is the summary with links: - [resubmit,net] net: fec: Stop PPS on driver remove https://git.kernel.org/netdev/net/c/8fee6d5ad5fa You are awesome, thank you!
diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c index e32f6724f568..2e4f3e1782a2 100644 --- a/drivers/net/ethernet/freescale/fec_ptp.c +++ b/drivers/net/ethernet/freescale/fec_ptp.c @@ -775,6 +775,9 @@ void fec_ptp_stop(struct platform_device *pdev) struct net_device *ndev = platform_get_drvdata(pdev); struct fec_enet_private *fep = netdev_priv(ndev); + if (fep->pps_enable) + fec_ptp_enable_pps(fep, 0); + cancel_delayed_work_sync(&fep->time_keep); hrtimer_cancel(&fep->perout_timer); if (fep->ptp_clock)
PPS was not stopped in `fec_ptp_stop()`, called when the adapter was removed. Consequentially, you couldn't safely reload the driver with the PPS signal on. Fixes: 32cba57ba74b ("net: fec: introduce fec_ptp_stop and use in probe fail path") Reviewed-by: Fabio Estevam <festevam@gmail.com> Link: https://lore.kernel.org/netdev/CAOMZO5BzcZR8PwKKwBssQq_wAGzVgf1ffwe_nhpQJjviTdxy-w@mail.gmail.com/T/#m01dcb810bfc451a492140f6797ca77443d0cb79f Signed-off-by: Csókás, Bence <csokas.bence@prolan.hu> --- drivers/net/ethernet/freescale/fec_ptp.c | 3 +++ 1 file changed, 3 insertions(+)