From patchwork Mon Oct 14 07:21:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 20995 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f71.google.com (mail-oa0-f71.google.com [209.85.219.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A715620D84 for ; Mon, 14 Oct 2013 07:21:14 +0000 (UTC) Received: by mail-oa0-f71.google.com with SMTP id i3sf23056322oag.10 for ; Mon, 14 Oct 2013 00:21:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=2AgGiJnayytr7PeRmZTDkTbqdeIWb+VGUhTeUGLHus0=; b=b1HXi32oU34EGLAI1UlEE5/dnNV1uN9BZRbPs/X1JECXMvjKiOgI2P6yfCXqOzC4qm gX72ngB47yszdQFp8Z3Unje/558/1cKKV0STK9jX09MTXNE50U8So+lB3ZlLuY7Wcefd FCBV5s6m4lVulrJu1URKdIt/QdUG1EAB5XhOeXCdd//rsfrDEu6aSENwZuk5FwZtaEQs kKeLDRYpDtZbZO2MDgu5YWZZ/OIjl2SB6NR63OhIUQT5O+jUX6YDIaSh5SdNREA91Nvg eyp35uVaWi3j9eT78ZI4yfJwVgBEe+SqUhihxbeQpagT2lzrrFI4cQ3PiH/El9azpnmJ lABA== X-Received: by 10.182.109.200 with SMTP id hu8mr11895003obb.20.1381735273891; Mon, 14 Oct 2013 00:21:13 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.1.130 with SMTP id 2ls2162716qem.93.gmail; Mon, 14 Oct 2013 00:21:13 -0700 (PDT) X-Received: by 10.220.174.200 with SMTP id u8mr27372795vcz.6.1381735273799; Mon, 14 Oct 2013 00:21:13 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id 10si20773903vcs.30.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 14 Oct 2013 00:21:13 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id if17so4254784vcb.4 for ; Mon, 14 Oct 2013 00:21:13 -0700 (PDT) X-Gm-Message-State: ALoCoQl6YtqBIdHRIxKA9084GowZKORZQ1AjdAjUUWeMUCYe4F7ourEvtYc0fMGifQeqj1YRs4qP X-Received: by 10.220.186.202 with SMTP id ct10mr33937643vcb.14.1381735273494; Mon, 14 Oct 2013 00:21:13 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp203326vcz; Mon, 14 Oct 2013 00:21:12 -0700 (PDT) X-Received: by 10.112.168.170 with SMTP id zx10mr29151263lbb.0.1381735271637; Mon, 14 Oct 2013 00:21:11 -0700 (PDT) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com [209.85.217.169]) by mx.google.com with ESMTPS id ds1si27623150lac.61.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 14 Oct 2013 00:21:11 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.217.169 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.217.169; Received: by mail-lb0-f169.google.com with SMTP id z5so5301744lbh.14 for ; Mon, 14 Oct 2013 00:21:11 -0700 (PDT) X-Received: by 10.152.180.139 with SMTP id do11mr19635559lac.23.1381735270905; Mon, 14 Oct 2013 00:21:10 -0700 (PDT) Received: from linaro-ulf.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id oc1sm42851429lbb.3.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 14 Oct 2013 00:21:09 -0700 (PDT) From: Ulf Hansson To: "Rafael J. Wysocki" , Len Brown , Pavel Machek , linux-pm@vger.kernel.org Cc: Ulf Hansson , Alan Stern , Mika Westerberg , Kevin Hilman , Rob Landley , Chris Ball , linux-mmc@vger.kernel.org Subject: [PATCH V2] PM / Runtime: Respect autosuspend when idle triggers suspend Date: Mon, 14 Oct 2013 09:21:04 +0200 Message-Id: <1381735264-3077-1-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , For devices which don't have a .runtime_idle callback or if it returns 0, rpm_idle will end up in triggering a call to rpm_suspend, thus trying to carry out a runtime_suspend directly from runtime_idle. In the above situation we want to respect devices which has enabled autosuspend, we therfore append the flag sent to rpm_suspend with RPM_AUTO. Do note that driver's still needs to update the device last busy mark, to control the delay for this circumstance. Updated runtime PM documentation accordingly. Cc: Alan Stern Cc: Mika Westerberg Cc: Kevin Hilman Cc: Rob Landley Cc: Chris Ball Cc: linux-mmc@vger.kernel.org Signed-off-by: Ulf Hansson --- Documentation/power/runtime_pm.txt | 13 +++++++------ drivers/base/power/runtime.c | 6 ++++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Documentation/power/runtime_pm.txt b/Documentation/power/runtime_pm.txt index 71d8fe4..236d9f4 100644 --- a/Documentation/power/runtime_pm.txt +++ b/Documentation/power/runtime_pm.txt @@ -145,11 +145,12 @@ The action performed by the idle callback is totally dependent on the subsystem if the device can be suspended (i.e. if all of the conditions necessary for suspending the device are satisfied) and to queue up a suspend request for the device in that case. If there is no idle callback, or if the callback returns -0, then the PM core will attempt to carry out a runtime suspend of the device; -in essence, it will call pm_runtime_suspend() directly. To prevent this (for -example, if the callback routine has started a delayed suspend), the routine -should return a non-zero value. Negative error return codes are ignored by the -PM core. +0, then the PM core will attempt to carry out a runtime suspend of the device, +also respecting devices configured for autosuspend. In essence it means a call +to pm_runtime_autosuspend(). Do note that driver's still needs to update the +device last busy mark (pm_runtime_mark_last_busy), to control the delay under +this circumstance. To prevent this, the routine must return a non-zero value. +Negative error return codes are ignored by the PM core. The helper functions provided by the PM core, described in Section 4, guarantee that the following constraints are met with respect to runtime PM callbacks for @@ -308,7 +309,7 @@ drivers/base/power/runtime.c and include/linux/pm_runtime.h: - execute the subsystem-level idle callback for the device; returns an error code on failure, where -EINPROGRESS means that ->runtime_idle() is already being executed; if there is no callback or the callback returns 0 - then run pm_runtime_suspend(dev) and return its result + then run pm_runtime_autosuspend(dev) and return its result int pm_runtime_suspend(struct device *dev); - execute the subsystem-level suspend callback for the device; returns 0 on diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 268a350..e6867d4 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c @@ -258,7 +258,9 @@ static int __rpm_callback(int (*cb)(struct device *), struct device *dev) * Check if the device's runtime PM status allows it to be suspended. If * another idle notification has been started earlier, return immediately. If * the RPM_ASYNC flag is set then queue an idle-notification request; otherwise - * run the ->runtime_idle() callback directly. + * run the ->runtime_idle() callback directly. If the ->runtime_idle callback + * doesn't exist or if it returns 0, run rpm_suspend with RPM_AUTO flag to + * respect drivers using autosuspend. * * This function must be called under dev->power.lock with interrupts disabled. */ @@ -331,7 +333,7 @@ static int rpm_idle(struct device *dev, int rpmflags) out: trace_rpm_return_int(dev, _THIS_IP_, retval); - return retval ? retval : rpm_suspend(dev, rpmflags); + return retval ? retval : rpm_suspend(dev, rpmflags | RPM_AUTO); } /**