Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae79a639 authored by Giuseppe CAVALLARO's avatar Giuseppe CAVALLARO Committed by David S. Miller
Browse files

stmmac: fix resource management when resume 



There is a memleak when suspend/resume this driver version.
Currently the stmmac, during resume step, reallocates all the resources
but they are not released when suspend.
The patch is not to release these resources but the logic has been changed.
In fact, it is not necessary to free and reallocate all from scratch
because the memory data will be always preserved.
As final solution, the patch just reinit the descriptors and the rx/tx
pointers only when resume. Tested done on STi boxes.

Reported-by: default avatarZhengShunQian <zhengsq@rock-chips.com>
Signed-off-by: default avatarGiuseppe Cavallaro <peppe.cavallaro@st.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b17c1d9a

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+6 −3
Original line number Diff line number Diff line
@@ -3046,8 +3046,6 @@ int stmmac_suspend(struct net_device *ndev) 
	priv->hw->dma->stop_tx(priv->ioaddr);

	priv->hw->dma->stop_rx(priv->ioaddr);



	stmmac_clear_descriptors(priv);



	/* Enable Power down mode by programming the PMT regs */

	if (device_may_wakeup(priv->device)) {

		priv->hw->mac->pmt(priv->hw, priv->wolopts);
@@ -3105,7 +3103,12 @@ int stmmac_resume(struct net_device *ndev) 


	netif_device_attach(ndev);



	init_dma_desc_rings(ndev, GFP_ATOMIC);

	priv->cur_rx = 0;

	priv->dirty_rx = 0;

	priv->dirty_tx = 0;

	priv->cur_tx = 0;

	stmmac_clear_descriptors(priv);



	stmmac_hw_setup(ndev, false);

	stmmac_init_tx_coalesce(priv);

	stmmac_set_rx_mode(ndev);