From patchwork Tue Sep 29 15:32:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 7287641 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 378C59F1D5 for ; Tue, 29 Sep 2015 15:33:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 59F56206EF for ; Tue, 29 Sep 2015 15:33:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 783DF20569 for ; Tue, 29 Sep 2015 15:33:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934930AbbI2Pdq (ORCPT ); Tue, 29 Sep 2015 11:33:46 -0400 Received: from mail-wi0-f174.google.com ([209.85.212.174]:32969 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964947AbbI2Pdb (ORCPT ); Tue, 29 Sep 2015 11:33:31 -0400 Received: by wiclk2 with SMTP id lk2so157068569wic.0; Tue, 29 Sep 2015 08:33:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=MoxnHpcGm99Ux+ucP/k6JOinZXrvp3Px4l1vM5GAGbY=; b=oljQc5rmBbLJao/A7yH2jCUJh1WKV4QkdKwdCnWRyuZRMCmkRZhI4/K0fIRC7slG+h vifvYpH0mnS1Y3m8iqSnrddUoqBFr26stbnUc0DTyhKr+8XWj9GnRgMyFlFCJfSz+BOM Ypg6jWtzXqGURjdFcP3oWjdmjIktAFtc/2M5uBrkRFa40+hScM5xUtOhHNDB/AKtlRlA LY70GTzPPGpmmVVmIXYZ8gyi7l+076zra12FyMwJM99RwH8KJe8WTUZuRqiRV+/kaht9 OEfD2uSmhmKRkAskvV6H6m2ajtd4XTt7al0o5Ou1HK1e6Ph7Pef9YobQx7pruJWh40N+ K0Og== X-Received: by 10.194.117.164 with SMTP id kf4mr29353615wjb.9.1443540809783; Tue, 29 Sep 2015 08:33:29 -0700 (PDT) Received: from cizrna.lan ([109.72.12.204]) by smtp.gmail.com with ESMTPSA id s1sm12251899wik.16.2015.09.29.08.33.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2015 08:33:28 -0700 (PDT) From: Tomeu Vizoso To: linux-pm@vger.kernel.org, Alan Stern , "Rafael J. Wysocki" , martyn.welch@collabora.co.uk Cc: Tomeu Vizoso , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 2/2] USB / PM: Allow USB devices to remain runtime-suspended when sleeping Date: Tue, 29 Sep 2015 17:32:54 +0200 Message-Id: <1443540774-5286-3-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1443540774-5286-1-git-send-email-tomeu.vizoso@collabora.com> References: <1443540774-5286-1-git-send-email-tomeu.vizoso@collabora.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Have dev_pm_ops.prepare return 1 for USB devices and ports so that USB devices can remain runtime-suspended when the system goes to a sleep state, if their wakeup state is correct and they have runtime PM enabled. Signed-off-by: Tomeu Vizoso --- drivers/usb/core/port.c | 6 ++++++ drivers/usb/core/usb.c | 11 ++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/usb/core/port.c b/drivers/usb/core/port.c index 210618319f10..f49707d73b5a 100644 --- a/drivers/usb/core/port.c +++ b/drivers/usb/core/port.c @@ -168,12 +168,18 @@ static int usb_port_runtime_suspend(struct device *dev) return retval; } + +static int usb_port_prepare(struct device *dev) +{ + return 1; +} #endif static const struct dev_pm_ops usb_port_pm_ops = { #ifdef CONFIG_PM .runtime_suspend = usb_port_runtime_suspend, .runtime_resume = usb_port_runtime_resume, + .prepare = usb_port_prepare, #endif }; diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index 8d5b2f4113cd..cf4dde11db1c 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c @@ -316,7 +316,16 @@ static int usb_dev_uevent(struct device *dev, struct kobj_uevent_env *env) static int usb_dev_prepare(struct device *dev) { - return 0; /* Implement eventually? */ + struct usb_device *udev = to_usb_device(dev); + + if (!pm_runtime_enabled(dev)) + return 0; + + /* Return 0 if the current wakeup setting is wrong, otherwise 1 */ + if (udev->do_remote_wakeup != device_may_wakeup(dev)) + return 0; + + return 1; } static void usb_dev_complete(struct device *dev)