提交 bcc67771 编写于 作者: S Shawn Guo 提交者: David S. Miller

net/fec: improve pm for better suspend/resume

The following commit made a fix to use fec_enet_open/fec_enet_close
over fec_enet_init/fec_stop for suspend/resume, because fec_enet_init
does not allow to have a working network interface at resume.

  e3fe8558
  net/fec: fix pm to survive to suspend/resume

This fix works for i.mx/mxc fec controller, but fails on mx28 fec
which gets a different interrupt logic design. On i.mx fec, interrupt
can be triggered even bit ETHER_EN of ECR register is not set. But
on mx28 fec, ETHER_EN must be set to get interrupt work. Meanwhile,
MII interrupt is mandatory to resume the driver, because MDIO
read/write changed to interrupt mode by commit below.

  97b72e43
  fec: use interrupt for MDIO completion indication

fec_restart/fec_stop comes out as the solution working for both
cases.
Signed-off-by: NShawn Guo <shawn.guo@freescale.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 49da97dc
...@@ -1372,8 +1372,10 @@ fec_suspend(struct device *dev) ...@@ -1372,8 +1372,10 @@ fec_suspend(struct device *dev)
if (ndev) { if (ndev) {
fep = netdev_priv(ndev); fep = netdev_priv(ndev);
if (netif_running(ndev)) if (netif_running(ndev)) {
fec_enet_close(ndev); fec_stop(ndev);
netif_device_detach(ndev);
}
clk_disable(fep->clk); clk_disable(fep->clk);
} }
return 0; return 0;
...@@ -1388,8 +1390,10 @@ fec_resume(struct device *dev) ...@@ -1388,8 +1390,10 @@ fec_resume(struct device *dev)
if (ndev) { if (ndev) {
fep = netdev_priv(ndev); fep = netdev_priv(ndev);
clk_enable(fep->clk); clk_enable(fep->clk);
if (netif_running(ndev)) if (netif_running(ndev)) {
fec_enet_open(ndev); fec_restart(ndev, fep->full_duplex);
netif_device_attach(ndev);
}
} }
return 0; return 0;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册