From patchwork Fri Jul 14 17:10:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thara Gopinath X-Patchwork-Id: 9841457 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EDCA460381 for ; Fri, 14 Jul 2017 17:10:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D4359287A2 for ; Fri, 14 Jul 2017 17:10:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C900C287A9; Fri, 14 Jul 2017 17:10:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 68F79287A2 for ; Fri, 14 Jul 2017 17:10:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753665AbdGNRKV (ORCPT ); Fri, 14 Jul 2017 13:10:21 -0400 Received: from mail-qk0-f175.google.com ([209.85.220.175]:36863 "EHLO mail-qk0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753446AbdGNRKV (ORCPT ); Fri, 14 Jul 2017 13:10:21 -0400 Received: by mail-qk0-f175.google.com with SMTP id v17so74497750qka.3 for ; Fri, 14 Jul 2017 10:10:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=NXK6xvz/2z70cmdVVcaY3rOA89j+6iEtQ+ATCagLU1U=; b=fVIDl7qvBnXoFPz4DqsZ4PR8hLe7ltLGb/o3e1u5Ye6f7rzQpSPytESuarX72k0b4o Zq650rUITFsaPHOb3WjMKLFqIhRPYzvuyrl/ZvhJKfbEEumaHD7ZJ4LGohMmnfih6IEs sD1MFXEj1psM/7/T1r7yUUOjq37+lErvx8O1s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=NXK6xvz/2z70cmdVVcaY3rOA89j+6iEtQ+ATCagLU1U=; b=r1bBn0u+4xfrvYXtECIwNmVxO174YHtPjA8kb4Y0lX+qbiYOuX08z4de2KNRHacc9Q i5uIlBorAx1J31YuyakWA+8T/a9fq73igBGf3IGjgVniY+p+npG7Jvvj5nB5iwbn8Hdr wcM0tnX8DnTNbmzJ9rxHnoP9gOAp6O/Mz6FMAceN6P82kV6XNs03mG0cUcQ832bYfFC1 DAfcv+Dch/q+yu30qCgEa+R32TCw9HmdLcE6CuTV1bUGCJhmqq6dfS04Af8BgZxGH9Pi guok+YWLhLDtZtZoACMe492cFgZjX+bgyvSlXgpMricF25y8hNoIzO4JjRMnqfs/Bnpe f+2Q== X-Gm-Message-State: AIVw110l2DDFbSr9/LAf5K9GWdoEfq0PKG6g7+pRciYGoDTzyUTFssYW yS5qJDGEWlHA2Cp6 X-Received: by 10.55.33.194 with SMTP id f63mr12011123qki.112.1500052220167; Fri, 14 Jul 2017 10:10:20 -0700 (PDT) Received: from Thara-Work-Ubuntu.fios-router.home (pool-71-255-245-167.washdc.fios.verizon.net. [71.255.245.167]) by smtp.googlemail.com with ESMTPSA id c18sm7546799qtd.62.2017.07.14.10.10.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 14 Jul 2017 10:10:19 -0700 (PDT) From: Thara Gopinath To: ulf.hansson@linaro.org, khilman@kernel.org, rjw@rjwysocki.net, gregkh@linuxfoundation.org, linux-pm@vger.kernel.org Subject: [PATCH V4 1/2] PM / Domains: Add time accounting to various genpd states. Date: Fri, 14 Jul 2017 13:10:15 -0400 Message-Id: <1500052216-22252-2-git-send-email-thara.gopinath@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1500052216-22252-1-git-send-email-thara.gopinath@linaro.org> References: <1500052216-22252-1-git-send-email-thara.gopinath@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds support to calculate the time spent by the generic power domains in on and various idle states. Signed-off-by: Thara Gopinath Acked-by: Ulf Hansson --- drivers/base/power/domain.c | 32 ++++++++++++++++++++++++++++++++ include/linux/pm_domain.h | 3 +++ 2 files changed, 35 insertions(+) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 3b8210e..640ffc5 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -209,6 +209,34 @@ static void genpd_sd_counter_inc(struct generic_pm_domain *genpd) smp_mb__after_atomic(); } +#ifdef CONFIG_DEBUG_FS +static void genpd_update_accounting(struct generic_pm_domain *genpd) +{ + ktime_t delta, now; + + now = ktime_get(); + delta = ktime_sub(now, genpd->accounting_time); + + /* + * If genpd->status is active, it means we are just + * out of off and so update the idle time and vice + * versa. + */ + if (genpd->status == GPD_STATE_ACTIVE) { + int state_idx = genpd->state_idx; + + genpd->states[state_idx].idle_time = + ktime_add(genpd->states[state_idx].idle_time, delta); + } else { + genpd->on_time = ktime_add(genpd->on_time, delta); + } + + genpd->accounting_time = now; +} +#else +static inline void genpd_update_accounting(struct generic_pm_domain *genpd) {} +#endif + static int _genpd_power_on(struct generic_pm_domain *genpd, bool timed) { unsigned int state_idx = genpd->state_idx; @@ -361,6 +389,7 @@ static int genpd_power_off(struct generic_pm_domain *genpd, bool one_dev_on, } genpd->status = GPD_STATE_POWER_OFF; + genpd_update_accounting(genpd); list_for_each_entry(link, &genpd->slave_links, slave_node) { genpd_sd_counter_dec(link->master); @@ -413,6 +442,8 @@ static int genpd_power_on(struct generic_pm_domain *genpd, unsigned int depth) goto err; genpd->status = GPD_STATE_ACTIVE; + genpd_update_accounting(genpd); + return 0; err: @@ -1540,6 +1571,7 @@ int pm_genpd_init(struct generic_pm_domain *genpd, genpd->max_off_time_changed = true; genpd->provider = NULL; genpd->has_provider = false; + genpd->accounting_time = ktime_get(); genpd->domain.ops.runtime_suspend = genpd_runtime_suspend; genpd->domain.ops.runtime_resume = genpd_runtime_resume; genpd->domain.ops.prepare = pm_genpd_prepare; diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index 41004d9..84f423d 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -43,6 +43,7 @@ struct genpd_power_state { s64 power_on_latency_ns; s64 residency_ns; struct fwnode_handle *fwnode; + ktime_t idle_time; }; struct genpd_lock_ops; @@ -78,6 +79,8 @@ struct generic_pm_domain { unsigned int state_count; /* number of states */ unsigned int state_idx; /* state that genpd will go to when off */ void *free; /* Free the state that was allocated for default */ + ktime_t on_time; + ktime_t accounting_time; const struct genpd_lock_ops *lock_ops; union { struct mutex mlock;