summaryrefslogtreecommitdiffstats
path: root/tools/power
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2012-06-03 23:34:44 -0400
committerLen Brown <len.brown@intel.com>2012-06-03 23:47:49 -0400
commit650a37f32d2bc16fa802075be579802bc4ec4132 (patch)
treec4535bf1a5a16b8dc6ae528fd8c8a9845ed1a6f9 /tools/power
parentd15cf7c129fa4ec4b44c52521e49ffafb9749029 (diff)
downloadlinux-stable-650a37f32d2bc16fa802075be579802bc4ec4132.tar.gz
linux-stable-650a37f32d2bc16fa802075be579802bc4ec4132.tar.bz2
linux-stable-650a37f32d2bc16fa802075be579802bc4ec4132.zip
tools/power turbostat: fix IVB support
Initial IVB support went into turbostat in Linux-3.1: 553575f1ae048aa44682b46b3c51929a0b3ad337 (tools turbostat: recognize and run properly on IVB) However, when running on IVB, turbostat would fail to report the new couters added with SNB, c7, pc2 and pc7. So in scenarios where these counters are non-zero on IVB, turbostat would report erroneous residencey results. In particular c7 time would be added to c1 time, since c1 time is calculated as "that which is left over". Also, turbostat reports MHz capabilities when passed the "-v" option, and it would incorrectly report 133MHz bclk instead of 100MHz bclk for IVB, which would inflate GHz reported with that option. This patch is a backport of a fix already included in turbostat v2. Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'tools/power')
-rw-r--r--tools/power/x86/turbostat/turbostat.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index d5d6a3dc9bac..16de7ad4850f 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -933,6 +933,8 @@ int is_snb(unsigned int family, unsigned int model)
switch (model) {
case 0x2A:
case 0x2D:
+ case 0x3A: /* IVB */
+ case 0x3D: /* IVB Xeon */
return 1;
}
return 0;