From patchwork Wed Nov 28 12:43:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Glendinning X-Patchwork-Id: 202442 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 882C62C008F for ; Wed, 28 Nov 2012 23:43:44 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754715Ab2K1Mnl (ORCPT ); Wed, 28 Nov 2012 07:43:41 -0500 Received: from mail-ee0-f46.google.com ([74.125.83.46]:53921 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754291Ab2K1Mnj (ORCPT ); Wed, 28 Nov 2012 07:43:39 -0500 Received: by mail-ee0-f46.google.com with SMTP id e53so5707630eek.19 for ; Wed, 28 Nov 2012 04:43:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:x-gm-message-state; bh=Gmf8oQA365Hhz2uX/ydfKaToiY5oBpQWwAWn2qdjR6c=; b=i+6F99+ZCN37+1J7OFkQwu2Z6qxH71u9u8EqJApa20hdnE9xvB81+OajmFoGEO7CCB 6p0A7B9U9fgqAX+z9sv8WB57bHiTdxJwPt3JHZFF0CthLyuFdZT/VNLjoHsq/bFlzCDB DcJiCal6fYhjoNoGIKwRICaPjGtLDzw1Fn5tmewsswNLLmqyTud3WaPNgQmCC9yKSdWL ZFOVQTH2COz9fPDlgLtzXMVRPXPxmgcEDl0EwN8DoZSQusfOxQRAIAZu4d5Kj4uf2k+e iCOwEaRfBd4iK6/ajHaGfV4oBUM/3FZ++J/OBcwfBv3M+4Q4bWKhyBBgZDsKLyCvvjlM JFQg== MIME-Version: 1.0 Received: by 10.14.175.198 with SMTP id z46mr69159524eel.26.1354106616258; Wed, 28 Nov 2012 04:43:36 -0800 (PST) Received: by 10.14.204.194 with HTTP; Wed, 28 Nov 2012 04:43:36 -0800 (PST) In-Reply-To: <87k3t62btw.fsf@nemi.mork.no> References: <87y5hm9ap5.fsf@nemi.mork.no> <874nka3wgx.fsf@nemi.mork.no> <87k3t62btw.fsf@nemi.mork.no> Date: Wed, 28 Nov 2012 12:43:36 +0000 Message-ID: Subject: Re: [PATCH 1/2] smsc75xx: refactor entering suspend modes From: Steve Glendinning To: =?ISO-8859-1?Q?Bj=F8rn_Mork?= Cc: Alan Stern , netdev , linux-usb@vger.kernel.org, David Miller X-Gm-Message-State: ALoCoQlHVbTgfVz3cNkZakP8Z3laskDxuH+62sffAgEN1DSJ8/Z7S6VVhSmDiSq8KRxUBYJ1rLzX Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org > Looking at the different ethernet drivers, the normal way do do this > seems to be something like this in their .set_wol implementation: > > device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol); > > > where "adapter" is a netdev_priv private struct, "pdev" is a pci device > and "wol" is an u32. I don't see any problem doing the same for USB > network devices implementing ethtool "set_wol". Ahh, good spot. I've implemented this (patch below for reference) and it still doesn't work: $ cat /sys/bus/usb/devices/2-1.2/power/wakeup disabled $ sudo ethtool -s eth2 wol p [ 1607.237767] smsc75xx 2-1.2:1.0 eth2: set_wol before device_can_wakeup=1 device_may_wakeup=0 [ 1607.237772] smsc75xx 2-1.2:1.0 eth2: set_wol after device_can_wakeup=1 device_may_wakeup=1 $ cat /sys/bus/usb/devices/2-1.2/power/wakeup disabled Huh?! My debugging printk statements tell me I've succesfully set it, but then the sysfs entry is disabled when I read it. Is something else setting this back? My testing patch for reference (note this is against my tree with a few to-be submitted patches so won't apply cleanly!): static __must_check int __smsc75xx_phy_wait_not_busy(struct usbnet *dev, @@ -674,8 +653,19 @@ static int smsc75xx_ethtool_set_wol(struct net_device *net, { struct usbnet *dev = netdev_priv(net); struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]); + int ret; + + netdev_info(dev->net, "set_wol before device_can_wakeup=%d device_may_wakeup=%d\n", + device_can_wakeup(&net->dev), device_may_wakeup(&net->dev)); pdata->wolopts = wolinfo->wolopts & SUPPORTED_WAKE; + + ret = device_set_wakeup_enable(&net->dev, pdata->wolopts); + check_warn_return(ret, "device_set_wakeup_enable error %d\n", ret); + + netdev_info(dev->net, "set_wol after device_can_wakeup=%d device_may_wakeup=%d\n", + device_can_wakeup(&net->dev), device_may_wakeup(&net->dev)); + return 0; } @@ -1197,12 +1187,17 @@ static int smsc75xx_bind(struct usbnet *dev, struct usb_interface *intf) /* Init all registers */ ret = smsc75xx_reset(dev); + check_warn_return(ret, "smsc75xx_reset error %d\n", ret); dev->net->netdev_ops = &smsc75xx_netdev_ops; dev->net->ethtool_ops = &smsc75xx_ethtool_ops; dev->net->flags |= IFF_MULTICAST; dev->net->hard_header_len += SMSC75XX_TX_OVERHEAD; dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len; + + ret = device_init_wakeup(&dev->net->dev, 1); + check_warn_return(ret, "device_init_wakeup error %d\n", ret); + return 0; } @@ -1262,9 +1257,7 @@ static int smsc75xx_enter_suspend0(struct usbnet *dev) ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val); check_warn_return(ret, "Error writing PMT_CTL\n"); - smsc75xx_set_feature(dev, USB_DEVICE_REMOTE_WAKEUP); - - pdata->suspend_flags |= SUSPEND_SUSPEND0 | SUSPEND_REMOTEWAKE; + pdata->suspend_flags |= SUSPEND_SUSPEND0; return 0; } @@ -1291,9 +1284,7 @@ static int smsc75xx_enter_suspend1(struct usbnet *dev) ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val); check_warn_return(ret, "Error writing PMT_CTL\n"); - smsc75xx_set_feature(dev, USB_DEVICE_REMOTE_WAKEUP); - - pdata->suspend_flags |= SUSPEND_SUSPEND1 | SUSPEND_REMOTEWAKE; + pdata->suspend_flags |= SUSPEND_SUSPEND1; return 0; } @@ -1348,9 +1339,7 @@ static int smsc75xx_enter_suspend3(struct usbnet *dev) ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val); check_warn_return(ret, "Error writing PMT_CTL\n"); - smsc75xx_set_feature(dev, USB_DEVICE_REMOTE_WAKEUP); - - pdata->suspend_flags |= SUSPEND_SUSPEND3 | SUSPEND_REMOTEWAKE; + pdata->suspend_flags |= SUSPEND_SUSPEND3; return 0; } @@ -1650,11 +1639,6 @@ static int smsc75xx_resume(struct usb_interface *intf) /* do this first to ensure it's cleared even in error case */ pdata->suspend_flags = 0; - if (suspend_flags & SUSPEND_REMOTEWAKE) { - ret = smsc75xx_clear_feature(dev, USB_DEVICE_REMOTE_WAKEUP); - check_warn_return(ret, "Error disabling remote wakeup\n"); - } - if (suspend_flags & SUSPEND_ALLMODES) { /* Disable wakeup sources */ ret = smsc75xx_read_reg_nopm(dev, WUCSR, &val); --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c index d8fa649..4c17849 100644 --- a/drivers/net/usb/smsc75xx.c +++ b/drivers/net/usb/smsc75xx.c @@ -61,7 +61,6 @@ #define SUSPEND_SUSPEND1 (0x02) #define SUSPEND_SUSPEND2 (0x04) #define SUSPEND_SUSPEND3 (0x08) -#define SUSPEND_REMOTEWAKE (0x10) #define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \ SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3) @@ -172,26 +171,6 @@ static int __must_check smsc75xx_write_reg(struct usbnet *dev, u32 index, return __smsc75xx_write_reg(dev, index, data, 0); } -static int smsc75xx_set_feature(struct usbnet *dev, u32 feature) -{ - if (WARN_ON_ONCE(!dev)) - return -EINVAL; - - return usbnet_write_cmd_nopm(dev, USB_REQ_SET_FEATURE, - USB_DIR_OUT | USB_RECIP_DEVICE, - feature, 0, NULL, 0); -} - -static int smsc75xx_clear_feature(struct usbnet *dev, u32 feature) -{ - if (WARN_ON_ONCE(!dev)) - return -EINVAL; - - return usbnet_write_cmd_nopm(dev, USB_REQ_CLEAR_FEATURE, - USB_DIR_OUT | USB_RECIP_DEVICE, - feature, 0, NULL, 0); -} - /* Loop until the read is completed with timeout * called with phy_mutex held */