From: eric@eukrea.com (Eric Bénard)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2] net/fec: fix pm to survive to suspend/resume
Date: Sat, 29 May 2010 22:04:50 +0200 [thread overview]
Message-ID: <1275163490-13027-1-git-send-email-eric@eukrea.com> (raw)
In-Reply-To: <20100529.001534.57459102.davem@davemloft.net>
* in the actual driver, calling fec_stop and fec_enet_init doesn't
allow to have a working network interface at resume (where a
ifconfig down and up is required to recover the interface)
* by using fec_enet_close and fec_enet_open, this patch solves this
problem and handle the case where the link changed between suspend
and resume
* this patch also disable clock at suspend and reenable it at resume
Signed-off-by: Eric B?nard <eric@eukrea.com>
Cc: s.hauer at pengutronix.de
Cc: sshtylyov at mvista.com
Cc: linux-arm-kernel at lists.infradead.org
Cc: fabioestevam at yahoo.com
Cc: davem at davemloft.net
---
drivers/net/fec.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index 9b4e8f7..40ffdb8 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -1975,10 +1975,9 @@ fec_suspend(struct platform_device *dev, pm_message_t state)
if (ndev) {
fep = netdev_priv(ndev);
- if (netif_running(ndev)) {
- netif_device_detach(ndev);
- fec_stop(ndev);
- }
+ if (netif_running(ndev))
+ fec_enet_close(ndev);
+ clk_disable(fep->clk);
}
return 0;
}
@@ -1987,12 +1986,13 @@ static int
fec_resume(struct platform_device *dev)
{
struct net_device *ndev = platform_get_drvdata(dev);
+ struct fec_enet_private *fep;
if (ndev) {
- if (netif_running(ndev)) {
- fec_enet_init(ndev, 0);
- netif_device_attach(ndev);
- }
+ fep = netdev_priv(ndev);
+ clk_enable(fep->clk);
+ if (netif_running(ndev))
+ fec_enet_open(ndev);
}
return 0;
}
--
1.6.3.3
next prev parent reply other threads:[~2010-05-29 20:04 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-27 6:33 [PATCH v2 1/8] i.MX27: add suspend to RAM support Eric Bénard
2010-05-27 6:33 ` [PATCH v2 2/8] mxc_nand: fix PM Eric Bénard
2010-05-27 6:33 ` [PATCH v2 3/8] imx_keypad: add PM support Eric Bénard
2010-05-27 6:33 ` [PATCH v2 4/8] eukrea_mbimx27: update keyboard platform data Eric Bénard
2010-05-27 6:33 ` [PATCH v2 5/8] serial/imx.c: fix suspend/resume Eric Bénard
2010-05-27 6:33 ` [PATCH v2 6/8] serial/imx: drvdata is sport and not &sport->port Eric Bénard
2010-05-27 6:33 ` [PATCH v2 7/8] net/fec: fix pm to survive to suspend/resume Eric Bénard
2010-05-27 6:33 ` [PATCH v2 8/8] imxfb: fix PM Eric Bénard
2010-05-27 10:37 ` [PATCH v2 7/8] net/fec: fix pm to survive to suspend/resume Sergei Shtylyov
2010-05-27 14:19 ` [PATCH v3] " Eric Bénard
2010-05-27 17:09 ` Fabio Estevam
2010-05-27 17:53 ` [PATCH] " Eric Bénard
2010-05-29 7:15 ` David Miller
2010-05-29 20:04 ` Eric Bénard [this message]
2010-06-02 13:13 ` [PATCH v2] " David Miller
2010-05-29 12:23 ` [PATCH v2 3/8] imx_keypad: add PM support Alberto Panizzo
2010-05-30 8:51 ` [PATCH] " Eric Bénard
2010-06-02 8:02 ` Dmitry Torokhov
2010-05-27 17:55 ` [PATCH] mxc_nand: fix PM Eric Bénard
2010-06-14 7:07 ` Eric Bénard
2010-06-29 6:41 ` Artem Bityutskiy
2010-07-01 3:47 ` Artem Bityutskiy
2010-06-14 8:43 ` Uwe Kleine-König
2010-05-27 14:13 ` [PATCH v3] i.MX27: add suspend to RAM support Eric Bénard
2010-05-27 19:43 ` Russell King - ARM Linux
2010-05-27 20:06 ` Eric Bénard
2010-05-27 20:16 ` Russell King - ARM Linux
2010-05-27 20:48 ` [PATCH v4] " Eric Bénard
2010-05-27 20:54 ` [PATCH v3] " Eric Bénard
2010-05-27 21:46 ` Russell King - ARM Linux
2010-06-01 19:57 ` [PATCH v5] " Eric Bénard
2010-06-03 8:28 ` Sascha Hauer
2010-05-27 21:13 ` [PATCH v3] " Wolfram Sang
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=1275163490-13027-1-git-send-email-eric@eukrea.com \
--to=eric@eukrea.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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).