netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Shawn Guo <shawn.guo@freescale.com>
To: <davem@davemloft.net>, <gerg@snapgear.com>, <baruch@tkos.co.il>,
	<eric@eukrea.com>, <bryan.wu@canonical.com>,
	<r64343@freescale.com>, <B32542@freescale.com>,
	<u.kleine-koenig@pengutro
Subject: [PATCH v4 04/10] net/fec: improve pm for better suspend/resume
Date: Thu, 6 Jan 2011 15:13:12 +0800	[thread overview]
Message-ID: <1294297998-26930-5-git-send-email-shawn.guo@freescale.com> (raw)
In-Reply-To: <1294297998-26930-1-git-send-email-shawn.guo@freescale.com>

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.

  e3fe8558c7fc182972c3d947d88744482111f304
  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.

  97b72e4320a9aaa4a7f1592ee7d2da7e2c9bd349
  fec: use interrupt for MDIO completion indication

fec_restart/fec_stop comes out as the solution working for both
cases.

Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
---
 drivers/net/fec.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index 47a3c7b..8a1c51f 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -1372,8 +1372,10 @@ fec_suspend(struct device *dev)
 
 	if (ndev) {
 		fep = netdev_priv(ndev);
-		if (netif_running(ndev))
-			fec_enet_close(ndev);
+		if (netif_running(ndev)) {
+			fec_stop(ndev);
+			netif_device_detach(ndev);
+		}
 		clk_disable(fep->clk);
 	}
 	return 0;
@@ -1388,8 +1390,10 @@ fec_resume(struct device *dev)
 	if (ndev) {
 		fep = netdev_priv(ndev);
 		clk_enable(fep->clk);
-		if (netif_running(ndev))
-			fec_enet_open(ndev);
+		if (netif_running(ndev)) {
+			fec_restart(ndev, fep->full_duplex);
+			netif_device_attach(ndev);
+		}
 	}
 	return 0;
 }
-- 
1.7.1



  parent reply	other threads:[~2011-01-06  7:11 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-06  7:13 [PATCH v4 00/10] net/fec: add dual fec support for i.MX28 Shawn Guo
2011-01-06  7:13 ` [PATCH v4 01/10] net/fec: fix MMFR_OP type in fec_enet_mdio_write Shawn Guo
2011-01-06  7:13 ` [PATCH v4 02/10] net/fec: remove the use of "index" which is legacy Shawn Guo
2011-01-06  7:13 ` [PATCH v4 03/10] net/fec: add mac field into platform data and consolidate fec_get_mac Shawn Guo
2011-01-06  7:13 ` Shawn Guo [this message]
2011-01-06  7:13 ` [PATCH v4 05/10] net/fec: add dual fec support for mx28 Shawn Guo
2011-01-11 10:27   ` Sascha Hauer
2011-01-11 11:38     ` Shawn Guo
2011-01-11 12:24     ` Greg Ungerer
2011-01-11 13:07       ` Uwe Kleine-König
2011-01-11 13:25         ` Greg Ungerer
2011-01-12  7:42           ` Uwe Kleine-König
2011-01-13 14:48   ` Uwe Kleine-König
2011-01-14  5:48     ` Shawn Guo
2011-01-14  7:52       ` Uwe Kleine-König
2011-01-14 13:08         ` Shawn Guo
2011-01-17  8:16           ` Lothar Waßmann
2011-01-17  8:42             ` Uwe Kleine-König
2011-01-17 11:52             ` Shawn Guo
2011-01-17  9:06     ` Uwe Kleine-König
2011-01-13 21:06   ` Uwe Kleine-König
2011-01-06  7:13 ` [PATCH v4 06/10] ARM: mx28: update clock and device name for dual fec support Shawn Guo
2011-01-13 15:06   ` Uwe Kleine-König
2011-01-14  6:46     ` Shawn Guo
2011-01-14  6:53     ` [PATCH] ARM: mxs: pass fec device name via platform data Shawn Guo
2011-01-14  8:38       ` Uwe Kleine-König
2011-01-06  7:13 ` [PATCH v4 07/10] ARM: mx28: add the second fec device registration Shawn Guo
2011-01-11 10:29   ` Sascha Hauer
2011-01-11 11:39     ` Shawn Guo
2011-01-11 11:44       ` Sascha Hauer
2011-01-06  7:13 ` [PATCH v4 08/10] ARM: mxs: add ocotp read function Shawn Guo
2011-01-11 13:31   ` Sascha Hauer
2011-01-11 14:05     ` Uwe Kleine-König
2011-01-12  6:47     ` Shawn Guo
2011-01-12 14:50       ` Sascha Hauer
2011-01-12 16:01         ` Uwe Kleine-König
2011-01-13  1:55           ` Shawn Guo
2011-01-13 15:19   ` Uwe Kleine-König
2011-01-14  8:33     ` Sascha Hauer
2011-01-14 13:16       ` Shawn Guo
2011-01-19 10:48         ` Shawn Guo
2011-01-06  7:13 ` [PATCH v4 09/10] ARM: mx28: read fec mac address from ocotp Shawn Guo
2011-01-13 14:50   ` Uwe Kleine-König
2011-01-06  7:13 ` [PATCH v4 10/10] ARM: mxs: add initial pm support Shawn Guo
2011-01-09 23:44 ` [PATCH v4 00/10] net/fec: add dual fec support for i.MX28 David Miller
2011-01-10  3:08   ` Shawn Guo
2011-01-11  8:15   ` Shawn Guo
2011-01-11 12:07 ` [PATCH] net/fec: remove config FEC2 as it's used nowhere Shawn Guo
2011-01-11 22:03   ` David Miller
2011-01-11 12:09 ` [PATCH v5] ARM: mx28: add the second fec device registration Shawn Guo
2011-01-13 14:49   ` Uwe Kleine-König
2011-01-14  7:04     ` Shawn Guo
2011-01-14  7:24 ` [PATCH v5 08/10] ARM: mxs: add ocotp read function Shawn Guo
2011-01-14  8:40   ` Sascha Hauer
2011-01-14  9:48     ` Uwe Kleine-König
2011-01-14  8:42   ` Uwe Kleine-König
2011-01-14  7:25 ` [PATCH v5 09/10] ARM: mxs/mx28evk: read fec mac address from ocotp Shawn Guo
2011-01-14 15:11 ` [PATCH v6 08/10] ARM: mxs: add ocotp read function Shawn Guo
2011-01-24  9:05 ` [PATCH v5] ARM: mxs: add initial pm support Shawn Guo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1294297998-26930-5-git-send-email-shawn.guo@freescale.com \
    --to=shawn.guo@freescale.com \
    --cc=B32542@freescale.com \
    --cc=baruch@tkos.co.il \
    --cc=bryan.wu@canonical.com \
    --cc=davem@davemloft.net \
    --cc=eric@eukrea.com \
    --cc=gerg@snapgear.com \
    --cc=r64343@freescale.com \
    --cc=u.kleine-koenig@pengutro \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).