From patchwork Fri Apr 17 14:22:10 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Renninger X-Patchwork-Id: 18678 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n3HEKi7M024232 for ; Fri, 17 Apr 2009 14:22:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760934AbZDQOWX (ORCPT ); Fri, 17 Apr 2009 10:22:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761073AbZDQOWW (ORCPT ); Fri, 17 Apr 2009 10:22:22 -0400 Received: from cantor2.suse.de ([195.135.220.15]:49971 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750969AbZDQOWO (ORCPT ); Fri, 17 Apr 2009 10:22:14 -0400 Received: from Relay2.suse.de (mail2.suse.de [195.135.221.8]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id D30AD8655F; Fri, 17 Apr 2009 16:22:12 +0200 (CEST) From: Thomas Renninger To: lenb@kernel.org Cc: linux-acpi@vger.kernel.org, cpufreq@vger.kernel.org, venkatesh.pallipadi@intel.com, Thomas Renninger Subject: [PATCH 6/8] CPUFREQ: Add average frequency to sysfs exported files of cpufreq_stats Date: Fri, 17 Apr 2009 16:22:10 +0200 Message-Id: <1239978132-6261-7-git-send-email-trenn@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1239978132-6261-1-git-send-email-trenn@suse.de> References: <1239978132-6261-1-git-send-email-trenn@suse.de> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Average frequency can now be monitored easily (e.g. every second) by: watch -n1 cat /sys/devices/system/cpu/cpu*/cpufreq/stats/average_freq if CONFIG_CPU_FREQ_STAT is compiled and the cpufreq_stats module got loaded. Signed-off-by: Thomas Renninger Cc: Cc: "Pallipadi, Venkatesh" Cc: --- drivers/cpufreq/cpufreq_stats.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c index 5a62d67..64542dd 100644 --- a/drivers/cpufreq/cpufreq_stats.c +++ b/drivers/cpufreq/cpufreq_stats.c @@ -20,6 +20,9 @@ #include #include #include +#ifdef CONFIG_CPU_FREQ_STAT_DETAILS +#include +#endif static spinlock_t cpufreq_stats_lock; @@ -44,6 +47,10 @@ struct cpufreq_stats { }; static DEFINE_PER_CPU(struct cpufreq_stats *, cpufreq_stats_table); +#ifdef CONFIG_X86_AVERAGE_FREQUENCY +static DEFINE_PER_CPU(u64, saved_aperf); +static DEFINE_PER_CPU(u64, saved_mperf); +#endif struct cpufreq_stats_attribute { struct attribute attr; @@ -139,6 +146,28 @@ static ssize_t show_trans_table(struct cpufreq_policy *policy, char *buf) CPUFREQ_STATDEVICE_ATTR(trans_table, 0444, show_trans_table); #endif +#ifdef CONFIG_X86_AVERAGE_FREQUENCY +static ssize_t show_average_freq(struct cpufreq_policy *policy, char *buf) +{ + ssize_t len; + unsigned int average_perf; + + if (!cpu_has(¤t_cpu_data, X86_FEATURE_IDA)) { + len = sprintf(buf, "not supported\n"); + return len; + } + + average_perf = get_average_perf(policy, policy->cpu, + &per_cpu(saved_aperf, policy->cpu), + &per_cpu(saved_mperf, policy->cpu)); + + len = sprintf(buf, "%d\n", average_perf); + return len; +} +CPUFREQ_STATDEVICE_ATTR(average_freq, 0444, show_average_freq); +#endif + + CPUFREQ_STATDEVICE_ATTR(total_trans, 0444, show_total_trans); CPUFREQ_STATDEVICE_ATTR(time_in_state, 0444, show_time_in_state); @@ -148,6 +177,9 @@ static struct attribute *default_attrs[] = { #ifdef CONFIG_CPU_FREQ_STAT_DETAILS &_attr_trans_table.attr, #endif +#ifdef CONFIG_X86_AVERAGE_FREQUENCY + &_attr_average_freq.attr, +#endif NULL }; static struct attribute_group stats_attr_group = {