Commit 512089d9 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar

perf/x86/intel/rapl: Clean up the printk output

The output is inconsistent. Use a proper pr_fmt prefix and split out the
advertisement into a seperate function.

Remove the WARN_ON() in the failure case. It's pointless as we already know
where it failed.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andi Kleen <andi.kleen@intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Harish Chegondi <harish.chegondi@intel.com>
Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Cc: linux-kernel@vger.kernel.org
Link: http://lkml.kernel.org/r/20160222221012.504551295@linutronix.deSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 75c7003f
...@@ -44,6 +44,9 @@ ...@@ -44,6 +44,9 @@
* the duration of the measurement. Tools may use a function such as * the duration of the measurement. Tools may use a function such as
* ldexp(raw_count, -32); * ldexp(raw_count, -32);
*/ */
#define pr_fmt(fmt) "RAPL PMU: " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/perf_event.h> #include <linux/perf_event.h>
...@@ -144,7 +147,7 @@ static inline u64 rapl_read_counter(struct perf_event *event) ...@@ -144,7 +147,7 @@ static inline u64 rapl_read_counter(struct perf_event *event)
static inline u64 rapl_scale(u64 v, int cfg) static inline u64 rapl_scale(u64 v, int cfg)
{ {
if (cfg > NR_RAPL_DOMAINS) { if (cfg > NR_RAPL_DOMAINS) {
pr_warn("invalid domain %d, failed to scale data\n", cfg); pr_warn("Invalid domain %d, failed to scale data\n", cfg);
return v; return v;
} }
/* /*
...@@ -680,6 +683,21 @@ static int rapl_check_hw_unit(void (*quirk)(void)) ...@@ -680,6 +683,21 @@ static int rapl_check_hw_unit(void (*quirk)(void))
return 0; return 0;
} }
static void __init rapl_advertise(void)
{
int i;
pr_info("API unit is 2^-32 Joules, %d fixed counters, %llu ms ovfl timer\n",
hweight32(rapl_cntr_mask), rapl_timer_ms);
for (i = 0; i < NR_RAPL_DOMAINS; i++) {
if (rapl_cntr_mask & (1 << i)) {
pr_info("hw unit of domain %s 2^-%d Joules\n",
rapl_domain_names[i], rapl_hw_unit[i]);
}
}
}
static void __init cleanup_rapl_pmus(void) static void __init cleanup_rapl_pmus(void)
{ {
int cpu; int cpu;
...@@ -696,7 +714,7 @@ static const struct x86_cpu_id rapl_cpu_match[] = { ...@@ -696,7 +714,7 @@ static const struct x86_cpu_id rapl_cpu_match[] = {
static int __init rapl_pmu_init(void) static int __init rapl_pmu_init(void)
{ {
void (*quirk)(void) = NULL; void (*quirk)(void) = NULL;
int cpu, ret, i; int cpu, ret;
/* /*
* check for Intel processor family 6 * check for Intel processor family 6
...@@ -751,30 +769,16 @@ static int __init rapl_pmu_init(void) ...@@ -751,30 +769,16 @@ static int __init rapl_pmu_init(void)
} }
ret = perf_pmu_register(&rapl_pmu_class, "power", -1); ret = perf_pmu_register(&rapl_pmu_class, "power", -1);
if (WARN_ON(ret)) { if (ret)
pr_info("RAPL PMU detected, registration failed (%d), RAPL PMU disabled\n", ret);
goto out; goto out;
}
__perf_cpu_notifier(rapl_cpu_notifier); __perf_cpu_notifier(rapl_cpu_notifier);
cpu_notifier_register_done(); cpu_notifier_register_done();
rapl_advertise();
pr_info("RAPL PMU detected,"
" API unit is 2^-32 Joules,"
" %d fixed counters"
" %llu ms ovfl timer\n",
hweight32(rapl_cntr_mask),
rapl_timer_ms);
for (i = 0; i < NR_RAPL_DOMAINS; i++) {
if (rapl_cntr_mask & (1 << i)) {
pr_info("hw unit of domain %s 2^-%d Joules\n",
rapl_domain_names[i], rapl_hw_unit[i]);
}
}
return 0; return 0;
out: out:
pr_warn("Initialization failed (%d), disabled\n", ret);
cleanup_rapl_pmus(); cleanup_rapl_pmus();
cpu_notifier_register_done(); cpu_notifier_register_done();
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment