From: Jacob Pan Date: Tue, 2 Sep 2014 09:55:21 +0000 (-0700) Subject: powercap / RAPL: change domain detection message X-Git-Tag: android-x86-4.4-r2~513^2^3 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fcdf1797e1f8f6605b194e620a333e6d47e07672;p=android-x86%2Fkernel.git powercap / RAPL: change domain detection message Many CPUs do not support complete set of RAPL domains, as a result this detection failed message is very misleading and can be annoying. [ 5.082632] intel_rapl: RAPL domain core detection failed [ 5.088370] intel_rapl: RAPL domain uncore detection failed So lower the warning message to info and only print out the RAPL domains that are supported. Signed-off-by: Jacob Pan Signed-off-by: Rafael J. Wysocki --- diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c index a362dcc20ec0..45e05b32f9b6 100644 --- a/drivers/powercap/intel_rapl.c +++ b/drivers/powercap/intel_rapl.c @@ -1167,11 +1167,10 @@ static int rapl_detect_domains(struct rapl_package *rp, int cpu) for (i = 0; i < RAPL_DOMAIN_MAX; i++) { /* use physical package id to read counters */ - if (!rapl_check_domain(cpu, i)) + if (!rapl_check_domain(cpu, i)) { rp->domain_map |= 1 << i; - else - pr_warn("RAPL domain %s detection failed\n", - rapl_domain_names[i]); + pr_info("Found RAPL domain %s\n", rapl_domain_names[i]); + } } rp->nr_domains = bitmap_weight(&rp->domain_map, RAPL_DOMAIN_MAX); if (!rp->nr_domains) {