tuned/tuned-2.4.0-use_cpupower_for_intel_perf_bias.patch

Index: tuned-2.6.0/tuned/plugins/plugin_cpu.py
===================================================================
--- tuned-2.6.0.orig/tuned/plugins/plugin_cpu.py
+++ tuned-2.6.0/tuned/plugins/plugin_cpu.py
@@ -109,7 +109,8 @@ class CPULatencyPlugin(base.Plugin):
 			# Check for cpupower, use workaround if not available
 			self._check_cpupower()
 			# Check for x86_energy_perf_policy, ignore if not available / supported
-			self._check_energy_perf_bias()
+			if self._has_cpupower is False:
+				self._check_energy_perf_bias()
 			# Check for intel_pstate
 			self._check_intel_pstate()
 		else:
@@ -237,7 +238,17 @@ class CPULatencyPlugin(base.Plugin):
 		if not self._is_cpu_online(device):
 			log.debug("%s is not online, skipping" % device)
 			return None
-		if self._has_energy_perf_bias:
+		if self._has_cpupower is True:
+			bias_str = str(energy_perf_bias)
+			if bias_str == "performance":
+				bias_str = "0"
+			elif bias_str == "powersave":
+				bias_str = "15"
+			elif bias_str == "normal":
+				bias_str = "6"
+			cpu_id = device.lstrip("cpu")
+			self._cmd.execute(["cpupower", "-c", cpu_id, "set", "-b", bias_str])
+		elif self._has_energy_perf_bias:
 			if not sim:
 				cpu_id = device.lstrip("cpu")
 				log.info("setting energy_perf_bias '%s' on cpu '%s'" % (energy_perf_bias, device))
@@ -265,14 +276,21 @@ class CPULatencyPlugin(base.Plugin):
 		if not self._is_cpu_online(device):
 			log.debug("%s is not online, skipping" % device)
 			return None
-		if self._has_energy_perf_bias:
+		if self._has_cpupower is True:
+			cpu_id = device.lstrip("cpu")
+			retcode, lines = self._cmd.execute(["cpupower", "-c", cpu_id, "info", "-b"])
+		elif self._has_energy_perf_bias:
 			cpu_id = device.lstrip("cpu")
 			retcode, lines = self._cmd.execute(["x86_energy_perf_policy", "-c", cpu_id, "-r"])
-			if retcode == 0:
-				for line in lines.splitlines():
-					l = line.split()
-					if len(l) == 2:
-						energy_perf_bias = self._energy_perf_policy_to_human(l[1])
-						break
+		else:
+			return None
+		if retcode == 0:
+			for line in lines.splitlines():
+				if line.startswith("analyzing CPU"):
+					continue
+				l = line.split()
+				if len(l) == 2:
+					energy_perf_bias = l[1]
+					break
 
 		return energy_perf_bias