From patchwork Mon Feb 23 05:16:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 5862821 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 1606EBF440 for ; Mon, 23 Feb 2015 05:17:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 47D9D205BE for ; Mon, 23 Feb 2015 05:17:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6A5CD204E1 for ; Mon, 23 Feb 2015 05:16:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751093AbbBWFQ4 (ORCPT ); Mon, 23 Feb 2015 00:16:56 -0500 Received: from mail-pa0-f51.google.com ([209.85.220.51]:38749 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750797AbbBWFQz (ORCPT ); Mon, 23 Feb 2015 00:16:55 -0500 Received: by padbj1 with SMTP id bj1so24682968pad.5; Sun, 22 Feb 2015 21:16:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=xSq6eQCnNP26XjtxESjnRbjjWP+v/+N1ioNajO1fyAI=; b=SUjMcWkWKkNUmfsNdeehjpzaN1m8mQvGPgCoozAc+UM6JPHqBBxKQxBtJCFscImvrB K4nsJCdBRVFnjEx8bkbqX8Tzm1oPu2GqKNzvWXZOlU8EMTxDxpr0iF6qDDX3p+t251V8 Ig4Lry+zazuWtQ9f9btMb3mGPab/1dn5fuwu2YrWJpD7ENCAlWrk40ZUoeatc8O0U/JV D9Xu8+nMfINA0zSnlQ1C4mEQnBGIyhYRS440gN1bQNjsiRN/SSe4evfz8OA8ve7wrHRb 1E/KrJOzPuSm6KBiNeuFfJc5UmOqdU9t/RIvwhju8epBJrylEYj/7AdkqEUyhHutUVhI i49Q== X-Received: by 10.68.249.194 with SMTP id yw2mr15448782pbc.20.1424668615157; Sun, 22 Feb 2015 21:16:55 -0800 (PST) Received: from norris-Latitude-E6410 (cpe-76-169-7-156.socal.res.rr.com. [76.169.7.156]) by mx.google.com with ESMTPSA id y12sm24027919pdk.46.2015.02.22.21.16.51 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 22 Feb 2015 21:16:53 -0800 (PST) Date: Sun, 22 Feb 2015 21:16:49 -0800 From: Brian Norris To: "Rafael J. Wysocki" Cc: Linux Kernel , linux-pm@vger.kernel.org, Len Brown , Pavel Machek , Florian Fainelli , Kevin Cernekee , Chirantan Ekbote Subject: [PATCH v3] PM / sleep: add configurable delay for pm_test Message-ID: <20150223051649.GC24441@norris-Latitude-E6410> References: <1409788535-28264-1-git-send-email-computersforpeace@gmail.com> <20150222082654.GB24441@norris-Latitude-E6410> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20150222082654.GB24441@norris-Latitude-E6410> User-Agent: Mutt/1.5.21 (2010-09-15) 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_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 When CONFIG_PM_DEBUG=y, we provide a sysfs file (/sys/power/pm_test) for selecting one of a few suspend test modes, where rather than entering a full suspend state, the kernel will perform some subset of suspend steps, wait 5 seconds, and then resume back to normal operation. This mode is useful for (among other things) observing the state of the system just before entering a sleep mode, for debugging or analysis purposes. However, a constant 5 second wait is not sufficient for some sorts of analysis; for example, on an SoC, one might want to use external tools to probe the power states of various on-chip controllers or clocks. This patch turns this 5 second delay into a configurable module parameter, so users can determine how long to wait in this pseudo-suspend state before resuming the system. Example (wait 30 seconds); # echo 30 > /sys/module/suspend/parameters/pm_test_delay # echo core > /sys/power/pm_test # time echo mem > /sys/power/state ... [ 17.583625] suspend debug: Waiting for 30 second(s). ... real 0m30.381s user 0m0.017s sys 0m0.080s Signed-off-by: Brian Norris Acked-by: Pavel Machek Reviewed-by: Kevin Cernekee Acked-by: Florian Fainelli --- v3: - document in a few more places v2: - make this a module param instead of an explicit sysfs file - drop the for loop; mdelay() does the same loop internally - decrease +36 lines of code and +2 lines of doc, to +6 lines of code and +2 lines of doc Documentation/kernel-parameters.txt | 7 +++++++ Documentation/power/basic-pm-debugging.txt | 10 ++++++---- kernel/power/suspend.c | 13 +++++++++++-- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 176d4fe4f076..0b8a1fd0d08d 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -3433,6 +3433,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted. improve throughput, but will also increase the amount of memory reserved for use by the client. + suspend.pm_test_delay= + [SUSPEND] + Sets the number of seconds to remain in a suspend test + mode before resuming the system (see + /sys/power/pm_test). Only available when CONFIG_PM_DEBUG + is set. Default value is 5. + swapaccount=[0|1] [KNL] Enable accounting of swap in memory resource controller if no parameter or 1 is given or disable diff --git a/Documentation/power/basic-pm-debugging.txt b/Documentation/power/basic-pm-debugging.txt index edeecd447d23..b96098ccfe69 100644 --- a/Documentation/power/basic-pm-debugging.txt +++ b/Documentation/power/basic-pm-debugging.txt @@ -75,12 +75,14 @@ you should do the following: # echo platform > /sys/power/disk # echo disk > /sys/power/state -Then, the kernel will try to freeze processes, suspend devices, wait 5 seconds, -resume devices and thaw processes. If "platform" is written to +Then, the kernel will try to freeze processes, suspend devices, wait a few +seconds (5 by default, but configurable by the suspend.pm_test_delay module +parameter), resume devices and thaw processes. If "platform" is written to /sys/power/pm_test , then after suspending devices the kernel will additionally invoke the global control methods (eg. ACPI global control methods) used to -prepare the platform firmware for hibernation. Next, it will wait 5 seconds and -invoke the platform (eg. ACPI) global methods used to cancel hibernation etc. +prepare the platform firmware for hibernation. Next, it will wait a +configurable number of seconds and invoke the platform (eg. ACPI) global +methods used to cancel hibernation etc. Writing "none" to /sys/power/pm_test causes the kernel to switch to the normal hibernation/suspend operations. Also, when open for reading, /sys/power/pm_test diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index c347e3ce3a55..aee23dab0a55 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -28,6 +28,7 @@ #include #include #include +#include #include "power.h" @@ -204,12 +205,20 @@ static bool platform_suspend_again(suspend_state_t state) suspend_ops->suspend_again() : false; } +#ifdef CONFIG_PM_DEBUG +static unsigned int pm_test_delay = 5; +module_param(pm_test_delay, uint, 0644); +MODULE_PARM_DESC(pm_test_delay, + "Number of seconds to wait before resuming from suspend test"); +#endif + static int suspend_test(int level) { #ifdef CONFIG_PM_DEBUG if (pm_test_level == level) { - printk(KERN_INFO "suspend debug: Waiting for 5 seconds.\n"); - mdelay(5000); + printk(KERN_INFO "suspend debug: Waiting for %d second(s).\n", + pm_test_delay); + mdelay(pm_test_delay * 1000); return 1; } #endif /* !CONFIG_PM_DEBUG */