| Message ID | 20240524050528.4115581-1-xiaolei.wang@windriver.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [net,v3] net:fec: Add fec_enet_deinit() | expand |
On Fri, May 24, 2024 at 01:05:28PM +0800, Xiaolei Wang wrote: > When fec_probe() fails or fec_drv_remove() needs to release the > fec queue and remove a NAPI context, therefore add a function > corresponding to fec_enet_init() and call fec_enet_deinit() which > does the opposite to release memory and remove a NAPI context. > > Fixes: 59d0f7465644 ("net: fec: init multi queue date structure") > Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com> > Reviewed-by: Wei Fang <wei.fang@nxp.com> > --- > v1 -> v2 > - Add fec_enet_free_queue() in fec_drv_remove() > v2 -> v3 > - Add fec_enet_deinit() > > drivers/net/ethernet/freescale/fec_main.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c > index a72d8a2eb0b3..881ece735dcf 100644 > --- a/drivers/net/ethernet/freescale/fec_main.c > +++ b/drivers/net/ethernet/freescale/fec_main.c > @@ -4130,6 +4130,14 @@ static int fec_enet_init(struct net_device *ndev) > return ret; > } > > +static void fec_enet_deinit(struct net_device *ndev) > +{ > + struct fec_enet_private *fep = netdev_priv(ndev); > + > + netif_napi_del(&fep->napi); > + fec_enet_free_queue(ndev); > +} That is much better, and using the correct structure helped you find other bug.... Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
Hello: This patch was applied to netdev/net.git (main) by Jakub Kicinski <kuba@kernel.org>: On Fri, 24 May 2024 13:05:28 +0800 you wrote: > When fec_probe() fails or fec_drv_remove() needs to release the > fec queue and remove a NAPI context, therefore add a function > corresponding to fec_enet_init() and call fec_enet_deinit() which > does the opposite to release memory and remove a NAPI context. > > Fixes: 59d0f7465644 ("net: fec: init multi queue date structure") > Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com> > Reviewed-by: Wei Fang <wei.fang@nxp.com> > > [...] Here is the summary with links: - [net,v3] net:fec: Add fec_enet_deinit() https://git.kernel.org/netdev/net/c/bf0497f53c85 You are awesome, thank you!
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index a72d8a2eb0b3..881ece735dcf 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -4130,6 +4130,14 @@ static int fec_enet_init(struct net_device *ndev) return ret; } +static void fec_enet_deinit(struct net_device *ndev) +{ + struct fec_enet_private *fep = netdev_priv(ndev); + + netif_napi_del(&fep->napi); + fec_enet_free_queue(ndev); +} + #ifdef CONFIG_OF static int fec_reset_phy(struct platform_device *pdev) { @@ -4524,6 +4532,7 @@ fec_probe(struct platform_device *pdev) fec_enet_mii_remove(fep); failed_mii_init: failed_irq: + fec_enet_deinit(ndev); failed_init: fec_ptp_stop(pdev); failed_reset: @@ -4587,6 +4596,7 @@ fec_drv_remove(struct platform_device *pdev) pm_runtime_put_noidle(&pdev->dev); pm_runtime_disable(&pdev->dev); + fec_enet_deinit(ndev); free_netdev(ndev); }
When fec_probe() fails or fec_drv_remove() needs to release the fec queue and remove a NAPI context, therefore add a function corresponding to fec_enet_init() and call fec_enet_deinit() which does the opposite to release memory and remove a NAPI context. Fixes: 59d0f7465644 ("net: fec: init multi queue date structure") Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com> Reviewed-by: Wei Fang <wei.fang@nxp.com> --- v1 -> v2 - Add fec_enet_free_queue() in fec_drv_remove() v2 -> v3 - Add fec_enet_deinit() drivers/net/ethernet/freescale/fec_main.c | 10 ++++++++++ 1 file changed, 10 insertions(+)