Merge branch 'pm-tools'

* pm-tools: tools / power turbostat: Support Silvermont

Merge branch 'pm-tools'
* pm-tools: tools / power turbostat: Support Silvermont
6431b430 · Rafael J. Wysocki · 077a671d · 144b44b1 · 6431b430 · 6431b430
Commit 6431b430 authored Nov 19, 2013 by Rafael J. Wysocki
Showing with 143 additions and 56 deletions

arch/x86/include/uapi/asm/msr-index.h arch/x86/include/uapi/asm/msr-index.h +2 -0

tools/power/x86/turbostat/turbostat.c tools/power/x86/turbostat/turbostat.c +141 -56

No files found.
--- a/arch/x86/include/uapi/asm/msr-index.h
+++ b/arch/x86/include/uapi/asm/msr-index.h
@@ -147,6 +147,8 @@
 #define MSR_PP1_ENERGY_STATUS		0x00000641
 #define MSR_PP1_POLICY			0x00000642

+#define MSR_CORE_C1_RES			0x00000660
+
 #define MSR_AMD64_MC0_MASK		0xc0010044

 #define MSR_IA32_MCx_CTL(x)		(MSR_IA32_MC0_CTL + 4*(x))

--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c