From patchwork Wed Oct 21 15:34:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 7457591 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D0256BEEA4 for ; Wed, 21 Oct 2015 15:35:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 08B0D204EA for ; Wed, 21 Oct 2015 15:35:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0ABED20456 for ; Wed, 21 Oct 2015 15:35:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753870AbbJUPfE (ORCPT ); Wed, 21 Oct 2015 11:35:04 -0400 Received: from mail-wi0-f173.google.com ([209.85.212.173]:35960 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754132AbbJUPew (ORCPT ); Wed, 21 Oct 2015 11:34:52 -0400 Received: by wicfx6 with SMTP id fx6so97053856wic.1; Wed, 21 Oct 2015 08:34:50 -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=npd9b6kpHZFlrO5CqExuw8MFkuoV3htYBilw0a4qeq4=; b=NfOMw9d/sO1YiMCZG749O7gmB/kVyXJVNy9RSxB22BJ0Y9IpOyvuTWvz/r9oGRAl8p BCauld02g0v7UJGchiwy50ZFly6YZi9yTJnTJ0urkIVZTXB1RjX70EhJTph0oc4bcvlj dYojfhQ7zt76muEzM628CKMzKiypDGyxMt7u9jbcuNMwA9BIAMY+SgdeIY6MCnY8hFPU jAG9QlLSazHrIwhxQ/Xn62ithw17rM8bOKESkyBtexv42M2k3JBbGy1EYSYOxCzP4ddn 0mQzSn0yeRyIhKfXUhmTQPrxjoNjrNbLCUIXn1fIgJL3hXSITvOpDcAz3sumyHKJqqup CP6Q== X-Received: by 10.180.188.100 with SMTP id fz4mr36285928wic.28.1445441690756; Wed, 21 Oct 2015 08:34:50 -0700 (PDT) Received: from cizrna.lan ([109.72.12.185]) by smtp.gmail.com with ESMTPSA id x9sm11070828wjf.44.2015.10.21.08.34.48 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Oct 2015 08:34:49 -0700 (PDT) From: Tomeu Vizoso To: linux-pm@vger.kernel.org, Alan Stern , "Rafael J. Wysocki" , martyn.welch@collabora.co.uk, Ulf Hansson Cc: Tomeu Vizoso , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v10 4/4] USB / PM: Allow USB devices to remain runtime-suspended when sleeping Date: Wed, 21 Oct 2015 17:34:14 +0200 Message-Id: <1445441654-31778-5-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1445441654-31778-1-git-send-email-tomeu.vizoso@collabora.com> References: <1445441654-31778-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,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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 Reviewed-by: Ulf Hansson Acked-by: Alan Stern --- Changes in v10: - Remove superfluous call to pm_runtime_enabled() as suggested by Alan drivers/usb/core/port.c | 6 ++++++ drivers/usb/core/usb.c | 8 +++++++- 2 files changed, 13 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..3a55c91b13a1 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c @@ -316,7 +316,13 @@ 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); + + /* 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)