netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Steve Glendinning <steve.glendinning@shawell.net>
To: netdev@vger.kernel.org
Cc: Steve Glendinning <steve.glendinning@shawell.net>
Subject: [PATCH 5/5] smsc95xx: enable power saving mode during system suspend
Date: Mon, 24 Sep 2012 15:40:54 +0100	[thread overview]
Message-ID: <1348497654-9915-6-git-send-email-steve.glendinning@shawell.net> (raw)
In-Reply-To: <1348497654-9915-1-git-send-email-steve.glendinning@shawell.net>

This patch enables the device to enter its lowest power SUSPEND2
state during system suspend, instead of staying up using full power.

Signed-off-by: Steve Glendinning <steve.glendinning@shawell.net>
---
 drivers/net/usb/smsc95xx.c |   28 ++++++++++++++++++++++++++++
 drivers/net/usb/smsc95xx.h |    6 +++++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index f29860d..ecced91 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -1018,6 +1018,31 @@ static void smsc95xx_unbind(struct usbnet *dev, struct usb_interface *intf)
 	}
 }
 
+static int smsc95xx_suspend(struct usb_interface *intf, pm_message_t message)
+{
+	struct usbnet *dev = usb_get_intfdata(intf);
+	int ret;
+	u32 val;
+
+	BUG_ON(!dev);
+
+	ret = usbnet_suspend(intf, message);
+	check_warn_return(ret, "usbnet_suspend error");
+
+	netdev_info(dev->net, "entering SUSPEND2 mode");
+
+	ret = smsc95xx_read_reg(dev, PM_CTRL, &val);
+	check_warn_return(ret, "Error reading PM_CTRL");
+
+	val &= ~(PM_CTL_SUS_MODE_ | PM_CTL_WUPS_ | PM_CTL_PHY_RST_);
+	val |= PM_CTL_SUS_MODE_2;
+
+	ret = smsc95xx_write_reg(dev, PM_CTRL, val);
+	check_warn_return(ret, "Error writing PM_CTRL");
+
+	return 0;
+}
+
 static void smsc95xx_rx_csum_offload(struct sk_buff *skb)
 {
 	skb->csum = *(u16 *)(skb_tail_pointer(skb) - 2);
@@ -1283,6 +1308,9 @@ static struct usb_driver smsc95xx_driver = {
 	.suspend	= usbnet_suspend,
 	.resume		= usbnet_resume,
 	.reset_resume	= usbnet_resume,
+	.suspend	= smsc95xx_suspend,
+	.resume		= usbnet_resume,
+	.reset_resume	= usbnet_resume,
 	.disconnect	= usbnet_disconnect,
 	.disable_hub_initiated_lpm = 1,
 };
diff --git a/drivers/net/usb/smsc95xx.h b/drivers/net/usb/smsc95xx.h
index a275b62..89ad925 100644
--- a/drivers/net/usb/smsc95xx.h
+++ b/drivers/net/usb/smsc95xx.h
@@ -84,12 +84,16 @@
 #define HW_CFG_BCE_			(0x00000002)
 #define HW_CFG_SRST_			(0x00000001)
 
+#define RX_FIFO_INF			(0x18)
+
 #define PM_CTRL				(0x20)
+#define PM_CTL_RES_CLR_WKP_STS		(0x00000200)
 #define PM_CTL_DEV_RDY_			(0x00000080)
 #define PM_CTL_SUS_MODE_		(0x00000060)
 #define PM_CTL_SUS_MODE_0		(0x00000000)
 #define PM_CTL_SUS_MODE_1		(0x00000020)
-#define PM_CTL_SUS_MODE_2		(0x00000060)
+#define PM_CTL_SUS_MODE_2		(0x00000040)
+#define PM_CTL_SUS_MODE_3		(0x00000060)
 #define PM_CTL_PHY_RST_			(0x00000010)
 #define PM_CTL_WOL_EN_			(0x00000008)
 #define PM_CTL_ED_EN_			(0x00000004)
-- 
1.7.9.5

  parent reply	other threads:[~2012-09-24 14:46 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-24 14:40 [PATCH 0/5] smsc95xx enhancements Steve Glendinning
2012-09-24 14:40 ` [PATCH 1/5] smsc95xx: sleep before read for lengthy operations Steve Glendinning
2012-09-24 14:40 ` [PATCH 2/5] smsc95xx: remove unnecessary variables Steve Glendinning
2012-09-24 14:40 ` [PATCH 3/5] smsc95xx: check return code from control messages Steve Glendinning
2012-09-24 14:40 ` [PATCH 4/5] smsc95xx: fix resume when usb device is reset Steve Glendinning
2012-09-24 14:40 ` Steve Glendinning [this message]
2012-09-26 12:25   ` [PATCH 5/5] smsc95xx: enable power saving mode during system suspend Steve Glendinning
2012-09-27 23:17 ` [PATCH 0/5] smsc95xx enhancements David Miller
2012-09-28  8:42   ` Steve Glendinning
  -- strict thread matches above, loose matches on Subject: below --
2012-09-26 12:40 [PATCH 0/5] smsc95xx enhancements (v2) Steve Glendinning
2012-09-26 12:40 ` [PATCH 5/5] smsc95xx: enable power saving mode during system suspend Steve Glendinning
2012-09-26 14:23   ` Bjørn Mork
2012-09-26 15:16     ` Steve Glendinning
2012-09-26 15:48       ` Bjørn Mork
2012-09-26 15:58         ` Steve Glendinning
2012-09-26 16:17           ` Bjørn Mork
2012-09-27  8:04             ` Steve Glendinning
2012-09-27 17:14               ` Bjørn Mork

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=1348497654-9915-6-git-send-email-steve.glendinning@shawell.net \
    --to=steve.glendinning@shawell.net \
    --cc=netdev@vger.kernel.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).