58 lines
2.1 KiB
Diff
58 lines
2.1 KiB
Diff
|
From 623997fb90eab7a135c2c68a332c8450a488baca Mon Sep 17 00:00:00 2001
|
||
|
|
From: Srinivas Kandagatla <srinivas.kandagatla@st.com>
|
||
|
|
Date: Thu, 16 Jan 2014 10:52:35 +0000
|
||
|
|
Subject: [PATCH] net: stmmac: fix power management suspend-resume case
|
||
|
|
|
||
|
|
The driver PM resume assumes that the IP is still powered up and the
|
||
|
|
all the register contents are not disturbed when it comes out of low
|
||
|
|
power suspend case. This assumption is wrong, basically the driver
|
||
|
|
should not consider any state of registers after it comes out of low
|
||
|
|
power. However driver can keep the part of the IP powered up if its a
|
||
|
|
wake up source. But it can not assume the register state of the IP. Also
|
||
|
|
its possible that SOC glue layer can take the power off the IP if its
|
||
|
|
not wake-up source to reduce the power consumption.
|
||
|
|
|
||
|
|
This patch re initializes hardware by calling stmmac_hw_setup function in
|
||
|
|
resume case.
|
||
|
|
|
||
|
|
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
|
||
|
|
Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
|
||
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||
|
|
---
|
||
|
|
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 13 +++++++------
|
||
|
|
1 file changed, 7 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
||
|
|
index 341c8dc3..742a83f 100644
|
||
|
|
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
||
|
|
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
||
|
|
@@ -2887,18 +2887,19 @@ int stmmac_resume(struct net_device *ndev)
|
||
|
|
* this bit because it can generate problems while resuming
|
||
|
|
* from another devices (e.g. serial console).
|
||
|
|
*/
|
||
|
|
- if (device_may_wakeup(priv->device))
|
||
|
|
+ if (device_may_wakeup(priv->device)) {
|
||
|
|
priv->hw->mac->pmt(priv->ioaddr, 0);
|
||
|
|
- else
|
||
|
|
+ } else {
|
||
|
|
/* enable the clk prevously disabled */
|
||
|
|
clk_prepare_enable(priv->stmmac_clk);
|
||
|
|
+ /* reset the phy so that it's ready */
|
||
|
|
+ if (priv->mii)
|
||
|
|
+ stmmac_mdio_reset(priv->mii);
|
||
|
|
+ }
|
||
|
|
|
||
|
|
netif_device_attach(ndev);
|
||
|
|
|
||
|
|
- /* Enable the MAC and DMA */
|
||
|
|
- stmmac_set_mac(priv->ioaddr, true);
|
||
|
|
- priv->hw->dma->start_tx(priv->ioaddr);
|
||
|
|
- priv->hw->dma->start_rx(priv->ioaddr);
|
||
|
|
+ stmmac_hw_setup(ndev);
|
||
|
|
|
||
|
|
napi_enable(&priv->napi);
|
||
|
|
|
||
|
|
--
|
||
|
|
1.8.5.5
|
||
|
|
|