[kernel] r22484 - in dists/sid/linux/debian: . patches patches/bugfix/x86

[Ben Hutchings]

Author: benh
Date: Mon Apr  6 20:19:39 2015
New Revision: 22484

Log:
[x86] powercap / RAPL: change domain detection message (Closes: #781418)

Added:
   dists/sid/linux/debian/patches/bugfix/x86/powercap-rapl-change-domain-detection-message.patch
Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/patches/series

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Mon Apr  6 19:34:26 2015	(r22483)
+++ dists/sid/linux/debian/changelog	Mon Apr  6 20:19:39 2015	(r22484)
@@ -197,6 +197,7 @@
   * HID: thingm: fix workqueue race on remove (Closes: #780055)
   * [x86] Disable X86_VERBOSE_BOOTUP (Closes: #781953)
   * eMMC: Don't initialize partitions on RPMB flagged areas (Closes: #782038)
+  * [x86] powercap / RAPL: change domain detection message (Closes: #781418)
 
  -- Ian Campbell <ijc at debian.org>  Wed, 18 Mar 2015 21:07:15 +0000
 

Added: dists/sid/linux/debian/patches/bugfix/x86/powercap-rapl-change-domain-detection-message.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/bugfix/x86/powercap-rapl-change-domain-detection-message.patch	Mon Apr  6 20:19:39 2015	(r22484)
@@ -0,0 +1,40 @@
+From: Jacob Pan <jacob.jun.pan at linux.intel.com>
+Date: Tue, 2 Sep 2014 02:55:21 -0700
+Subject: powercap / RAPL: change domain detection message
+Origin: https://git.kernel.org/linus/fcdf1797e1f8f6605b194e620a333e6d47e07672
+
+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 <jacob.jun.pan at linux.intel.com>
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki at intel.com>
+---
+ drivers/powercap/intel_rapl.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
+index a362dcc..45e05b3 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) {

Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series	Mon Apr  6 19:34:26 2015	(r22483)
+++ dists/sid/linux/debian/patches/series	Mon Apr  6 20:19:39 2015	(r22484)
@@ -574,3 +574,4 @@
 bugfix/x86/drm-i915-add-limited-color-range-readout-for-hdmi-dp.patch
 bugfix/all/hid-thingm-fix-workqueue-race-on-remove.patch
 debian/emmc-don-t-initialize-partitions-on-rpmb-flagged-areas.patch
+bugfix/x86/powercap-rapl-change-domain-detection-message.patch