From patchwork Thu Jan 7 15:46:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 7978171 X-Patchwork-Delegate: rjw@sisk.pl 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 A4359BEEE5 for ; Thu, 7 Jan 2016 15:47:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5FE2920142 for ; Thu, 7 Jan 2016 15:47:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 37813200FE for ; Thu, 7 Jan 2016 15:47:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753740AbcAGPrL (ORCPT ); Thu, 7 Jan 2016 10:47:11 -0500 Received: from mail-wm0-f41.google.com ([74.125.82.41]:36946 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753307AbcAGPqn (ORCPT ); Thu, 7 Jan 2016 10:46:43 -0500 Received: by mail-wm0-f41.google.com with SMTP id f206so129929605wmf.0; Thu, 07 Jan 2016 07:46:42 -0800 (PST) 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=fydktJ8W0Ca67eq9+MjLNYuk4cM4mBi9bfu5clIlL1I=; b=RfHuxf2yMvnmDm3nZg6+cE3XR77GzynFI+w5hBbeB3bjjE+6dSz/D3AvCVT+AakfNi qunLu+laB6d3BcfDEjvzbBYwPKqvXnTXTTX7J7/+XgYlBQ4zxrcPuUS0ULdZhYCtwyNl iQOsKjrZK50jhb4pleZBpuRyqhXZqmtLA2IO6xLwPnQltimS/MIotE5SeiSjJV1ek/Oh zvl+Q1um3lgqso9PYPXJxfu1h6cZAVp8frz4MQAjRp2xN2nSdDmRoAoiGgXnEOhwxUpm WnB9qU9WCrmbERbwWOpO5EDju1Ej8qFRvw1w5Nkp3QKc4dtwqdLP8mBkLb76hlpZwPr6 I1YQ== X-Received: by 10.28.187.198 with SMTP id l189mr18258507wmf.89.1452181602199; Thu, 07 Jan 2016 07:46:42 -0800 (PST) Received: from cizrna.lan ([109.72.12.126]) by smtp.gmail.com with ESMTPSA id g187sm14145570wmf.8.2016.01.07.07.46.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jan 2016 07:46:41 -0800 (PST) From: Tomeu Vizoso To: linux-pm@vger.kernel.org, Alan Stern , "Rafael J. Wysocki" , martyn.welch@collabora.co.uk, Ulf Hansson , Daniel Kurtz Cc: Tomeu Vizoso , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v12 4/4] USB / PM: Allow USB devices to remain runtime-suspended when sleeping Date: Thu, 7 Jan 2016 16:46:15 +0100 Message-Id: <1452181575-9206-5-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1452181575-9206-1-git-send-email-tomeu.vizoso@collabora.com> References: <1452181575-9206-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 460c855be0d0..14718a9ffcfb 100644 --- a/drivers/usb/core/port.c +++ b/drivers/usb/core/port.c @@ -249,12 +249,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 77e4c9bc0ab1..ebb29caa3fe4 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c @@ -311,7 +311,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)