From: Daniel Mack <zonque@gmail•com>
To: netdev@vger•kernel.org
Cc: mugunthanvnm@ti•com, davem@davemloft•net, Daniel Mack <zonque@gmail•com>
Subject: [PATCH] net: ethernet: ti/cpsw: do not crash on single-MAC machines during resume
Date: Wed, 13 Nov 2013 13:53:00 +0100 [thread overview]
Message-ID: <1384347180-3490-1-git-send-email-zonque@gmail.com> (raw)
To prevent Oopses, cpsw_suspend() should only soft-reset sliver 1
on dual MAC enabled machines.
Signed-off-by: Daniel Mack <zonque@gmail•com>
---
drivers/net/ethernet/ti/cpsw.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index edd3e79..702b063 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -2173,8 +2173,11 @@ static int cpsw_suspend(struct device *dev)
if (netif_running(ndev))
cpsw_ndo_stop(ndev);
+
soft_reset("sliver 0", &priv->slaves[0].sliver->soft_reset);
- soft_reset("sliver 1", &priv->slaves[1].sliver->soft_reset);
+ if (priv->data.dual_emac)
+ soft_reset("sliver 1", &priv->slaves[1].sliver->soft_reset);
+
pm_runtime_put_sync(&pdev->dev);
/* Select sleep pin state */
--
1.8.4.2
next reply other threads:[~2013-11-13 12:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-13 12:53 Daniel Mack [this message]
2013-11-14 12:45 ` [PATCH] net: ethernet: ti/cpsw: do not crash on single-MAC machines during resume Mugunthan V N
2013-11-14 12:56 ` Daniel Mack
2013-11-14 13:09 ` Mugunthan V N
2013-11-15 7:01 ` Daniel Mack
2013-11-14 21:21 ` David Miller
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=1384347180-3490-1-git-send-email-zonque@gmail.com \
--to=zonque@gmail$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=mugunthanvnm@ti$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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