diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-10 10:11:26 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-10 10:11:26 -0500 |
| commit | b5e82233cab43c25fc0a1c28d9136a086db4aa52 (patch) | |
| tree | b98690b48f829b3f500770df4b56919f24fee8b0 /arch/x86/include | |
| parent | 7bc95d4ef1033af808cb0714081cb45cd4ee5669 (diff) | |
| parent | 994b7f10b0ea3b70a19043f8adb3326707bdc2a9 (diff) | |
Merge branch 'pm-tools'
* pm-tools:
tools/power turbostat: relax dependency on APERF_MSR
tools/power turbostat: relax dependency on invariant TSC
tools/power turbostat: decode MSR_*_PERF_LIMIT_REASONS
tools/power turbostat: relax dependency on root permission
cpupower Makefile change to help run the tool without 'make install'
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/uapi/asm/msr-index.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/include/uapi/asm/msr-index.h b/arch/x86/include/uapi/asm/msr-index.h index d11e1c57cfc5..91016b460dba 100644 --- a/arch/x86/include/uapi/asm/msr-index.h +++ b/arch/x86/include/uapi/asm/msr-index.h | |||
| @@ -152,6 +152,10 @@ | |||
| 152 | #define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668 | 152 | #define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668 |
| 153 | #define MSR_MC6_DEMOTION_POLICY_CONFIG 0x00000669 | 153 | #define MSR_MC6_DEMOTION_POLICY_CONFIG 0x00000669 |
| 154 | 154 | ||
| 155 | #define MSR_CORE_PERF_LIMIT_REASONS 0x00000690 | ||
| 156 | #define MSR_GFX_PERF_LIMIT_REASONS 0x000006B0 | ||
| 157 | #define MSR_RING_PERF_LIMIT_REASONS 0x000006B1 | ||
| 158 | |||
| 155 | /* Hardware P state interface */ | 159 | /* Hardware P state interface */ |
| 156 | #define MSR_PPERF 0x0000064e | 160 | #define MSR_PPERF 0x0000064e |
| 157 | #define MSR_PERF_LIMIT_REASONS 0x0000064f | 161 | #define MSR_PERF_LIMIT_REASONS 0x0000064f |