From patchwork Sat Dec 25 13:29:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Neukum X-Patchwork-Id: 76669 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B70A7B70E8 for ; Sun, 26 Dec 2010 00:28:22 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752020Ab0LYN2J (ORCPT ); Sat, 25 Dec 2010 08:28:09 -0500 Received: from smtp-out003.kontent.com ([81.88.40.217]:50926 "EHLO smtp-out003.kontent.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751521Ab0LYN2I convert rfc822-to-8bit (ORCPT ); Sat, 25 Dec 2010 08:28:08 -0500 Received: from vanamonde.suse.de (p5DCEA2DD.dip.t-dialin.net [93.206.162.221]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: neukum_org@smtp-out003.kontent.com) by smtp-out003.kontent.com (Postfix) with ESMTPSA id ED8DF400036B; Sat, 25 Dec 2010 14:28:07 +0100 (CET) From: Oliver Neukum To: netdev@vger.kernel.org, linux-usb@vger.kernel.org Subject: looking for testers for CDC EEM runtime power management Date: Sat, 25 Dec 2010 14:29:29 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.37-rc6-12-desktop+; KDE/4.4.4; x86_64; ; ) MIME-Version: 1.0 Message-Id: <201012251429.29343.oliver@neukum.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi, this patch implements runtime power management for CDC EEM. I lack the hardware and need testers. Regards Oliver From b9e2ecb3a81c122d37528af4283d9e2ebbb43d23 Mon Sep 17 00:00:00 2001 From: Oliver Neukum Date: Sat, 25 Dec 2010 14:25:45 +0100 Subject: [PATCH] cdc_eem: runtime power management This patch grants CDC EEM devices which request to be suspended their wish. Signed-off-by: Oliver Neukum --- drivers/net/usb/cdc_eem.c | 2 ++ drivers/net/usb/usbnet.c | 20 ++++++++++++++++++++ include/linux/usb/usbnet.h | 2 ++ 3 files changed, 24 insertions(+), 0 deletions(-) diff --git a/drivers/net/usb/cdc_eem.c b/drivers/net/usb/cdc_eem.c index 5f3b976..be319bd 100644 --- a/drivers/net/usb/cdc_eem.c +++ b/drivers/net/usb/cdc_eem.c @@ -245,6 +245,8 @@ static int eem_rx_fixup(struct usbnet *dev, struct sk_buff *skb) * - response complete: suggest N sec polling */ case 2: /* Suspend hint */ + usbnet_notify_idle(dev); + continue; case 3: /* Response hint */ case 4: /* Response complete hint */ continue; diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index c04d49e..95727a7 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -1201,6 +1201,24 @@ static void usbnet_bh (unsigned long param) } } +/*-------------------------------------------------------------------------*/ + +/* + * Some devices notify the host of an idle condition + * this makes use of this information + */ + +void usbnet_notify_idle(struct usbnet *dev) +{ + int r; + + if (!test_and_set_bit(EVENT_REP_IDLE, &dev->flags)) { + r = usb_autopm_get_interface_async(dev->intf); + if (r < 0) + clear_bit(EVENT_REP_IDLE, &dev->flags); + } +} +EXPORT_SYMBOL_GPL(usbnet_notify_idle); /*------------------------------------------------------------------------- * @@ -1495,6 +1513,8 @@ int usbnet_resume (struct usb_interface *intf) spin_unlock_irq(&dev->txq.lock); if (!(dev->txq.qlen >= TX_QLEN(dev))) netif_start_queue(dev->net); + if (test_and_clear_bit(EVENT_REP_IDLE, &dev->flags)) + usb_autopm_get_interface_no_resume(intf); tasklet_schedule (&dev->bh); } return 0; diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h index 7ae27a4..1cb929a 100644 --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h @@ -68,6 +68,7 @@ struct usbnet { # define EVENT_RX_PAUSED 5 # define EVENT_DEV_WAKING 6 # define EVENT_DEV_ASLEEP 7 +# define EVENT_REP_IDLE 8 }; static inline struct usb_driver *driver_of(struct usb_interface *intf) @@ -205,6 +206,7 @@ extern void usbnet_unlink_rx_urbs(struct usbnet *); extern void usbnet_pause_rx(struct usbnet *); extern void usbnet_resume_rx(struct usbnet *); extern void usbnet_purge_paused_rxq(struct usbnet *); +extern void usbnet_notify_idle(struct usbnet *); extern int usbnet_get_settings(struct net_device *net, struct ethtool_cmd *cmd);