diff options
author | Len Brown <len.brown@intel.com> | 2012-10-31 01:29:52 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2012-11-23 21:40:04 -0500 |
commit | 9c63a650bb100e7553d60c991ba0c5db9c743239 (patch) | |
tree | baa57daf942bbf8e121400c0a79528e6a5f63fb7 /arch/x86/include | |
parent | d91bb17c2a874493603c4d99db305d8caf2d180c (diff) |
tools/power/x86/turbostat: share kernel MSR #defines
Now that turbostat is built in the kernel tree,
it can share MSR #defines with the kernel.
Signed-off-by: Len Brown <len.brown@intel.com>
Cc: x86@kernel.org
Diffstat (limited to 'arch/x86/include')
-rw-r--r-- | arch/x86/include/asm/msr-index.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 7f0edceb7563..2639f816628e 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h | |||
@@ -35,11 +35,14 @@ | |||
35 | #define MSR_IA32_PERFCTR0 0x000000c1 | 35 | #define MSR_IA32_PERFCTR0 0x000000c1 |
36 | #define MSR_IA32_PERFCTR1 0x000000c2 | 36 | #define MSR_IA32_PERFCTR1 0x000000c2 |
37 | #define MSR_FSB_FREQ 0x000000cd | 37 | #define MSR_FSB_FREQ 0x000000cd |
38 | #define MSR_NHM_PLATFORM_INFO 0x000000ce | ||
38 | 39 | ||
39 | #define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 | 40 | #define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 |
40 | #define NHM_C3_AUTO_DEMOTE (1UL << 25) | 41 | #define NHM_C3_AUTO_DEMOTE (1UL << 25) |
41 | #define NHM_C1_AUTO_DEMOTE (1UL << 26) | 42 | #define NHM_C1_AUTO_DEMOTE (1UL << 26) |
42 | #define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25) | 43 | #define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25) |
44 | #define SNB_C1_AUTO_UNDEMOTE (1UL << 27) | ||
45 | #define SNB_C3_AUTO_UNDEMOTE (1UL << 28) | ||
43 | 46 | ||
44 | #define MSR_MTRRcap 0x000000fe | 47 | #define MSR_MTRRcap 0x000000fe |
45 | #define MSR_IA32_BBL_CR_CTL 0x00000119 | 48 | #define MSR_IA32_BBL_CR_CTL 0x00000119 |
@@ -55,6 +58,8 @@ | |||
55 | 58 | ||
56 | #define MSR_OFFCORE_RSP_0 0x000001a6 | 59 | #define MSR_OFFCORE_RSP_0 0x000001a6 |
57 | #define MSR_OFFCORE_RSP_1 0x000001a7 | 60 | #define MSR_OFFCORE_RSP_1 0x000001a7 |
61 | #define MSR_NHM_TURBO_RATIO_LIMIT 0x000001ad | ||
62 | #define MSR_IVT_TURBO_RATIO_LIMIT 0x000001ae | ||
58 | 63 | ||
59 | #define MSR_LBR_SELECT 0x000001c8 | 64 | #define MSR_LBR_SELECT 0x000001c8 |
60 | #define MSR_LBR_TOS 0x000001c9 | 65 | #define MSR_LBR_TOS 0x000001c9 |
@@ -103,6 +108,15 @@ | |||
103 | #define MSR_IA32_MC0_ADDR 0x00000402 | 108 | #define MSR_IA32_MC0_ADDR 0x00000402 |
104 | #define MSR_IA32_MC0_MISC 0x00000403 | 109 | #define MSR_IA32_MC0_MISC 0x00000403 |
105 | 110 | ||
111 | /* C-state Residency Counters */ | ||
112 | #define MSR_PKG_C3_RESIDENCY 0x000003f8 | ||
113 | #define MSR_PKG_C6_RESIDENCY 0x000003f9 | ||
114 | #define MSR_PKG_C7_RESIDENCY 0x000003fa | ||
115 | #define MSR_CORE_C3_RESIDENCY 0x000003fc | ||
116 | #define MSR_CORE_C6_RESIDENCY 0x000003fd | ||
117 | #define MSR_CORE_C7_RESIDENCY 0x000003fe | ||
118 | #define MSR_PKG_C2_RESIDENCY 0x0000060d | ||
119 | |||
106 | #define MSR_AMD64_MC0_MASK 0xc0010044 | 120 | #define MSR_AMD64_MC0_MASK 0xc0010044 |
107 | 121 | ||
108 | #define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) | 122 | #define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) |