diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-19 17:31:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-19 17:31:41 -0400 |
| commit | 09d51602cf84a1264946711dd4ea0dddbac599a1 (patch) | |
| tree | 41d96f89a1071659ff768b733115c7873a2f2778 /arch | |
| parent | 6162e4b0bedeb3dac2ba0a5e1b1f56db107d97ec (diff) | |
| parent | e9257f5fa48cc296d7eed35acf9f2ad195184122 (diff) | |
Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
Pull turbostat update from Len Brown:
"Updates to the turbostat utility.
Just one kernel dependency in this batch -- added a #define to
msr-index.h"
* 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
tools/power turbostat: correct dumped pkg-cstate-limit value
tools/power turbostat: calculate TSC frequency from CPUID(0x15) on SKL
tools/power turbostat: correct DRAM RAPL units on recent Xeon processors
tools/power turbostat: Initial Skylake support
tools/power turbostat: Use $(CURDIR) instead of $(PWD) and add support for O= option in Makefile
tools/power turbostat: modprobe msr, if needed
tools/power turbostat: dump MSR_TURBO_RATIO_LIMIT2
tools/power turbostat: use new MSR_TURBO_RATIO_LIMIT names
x86 msr-index: define MSR_TURBO_RATIO_LIMIT,1,2
tools/power turbostat: label base frequency
tools/power turbostat: update PERF_LIMIT_REASONS decoding
tools/power turbostat: simplify default output
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/include/uapi/asm/msr-index.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/include/uapi/asm/msr-index.h b/arch/x86/include/uapi/asm/msr-index.h index 1a4eae695ca8..c469490db4a8 100644 --- a/arch/x86/include/uapi/asm/msr-index.h +++ b/arch/x86/include/uapi/asm/msr-index.h | |||
| @@ -61,6 +61,9 @@ | |||
| 61 | #define MSR_OFFCORE_RSP_1 0x000001a7 | 61 | #define MSR_OFFCORE_RSP_1 0x000001a7 |
| 62 | #define MSR_NHM_TURBO_RATIO_LIMIT 0x000001ad | 62 | #define MSR_NHM_TURBO_RATIO_LIMIT 0x000001ad |
| 63 | #define MSR_IVT_TURBO_RATIO_LIMIT 0x000001ae | 63 | #define MSR_IVT_TURBO_RATIO_LIMIT 0x000001ae |
| 64 | #define MSR_TURBO_RATIO_LIMIT 0x000001ad | ||
| 65 | #define MSR_TURBO_RATIO_LIMIT1 0x000001ae | ||
| 66 | #define MSR_TURBO_RATIO_LIMIT2 0x000001af | ||
| 64 | 67 | ||
| 65 | #define MSR_LBR_SELECT 0x000001c8 | 68 | #define MSR_LBR_SELECT 0x000001c8 |
| 66 | #define MSR_LBR_TOS 0x000001c9 | 69 | #define MSR_LBR_TOS 0x000001c9 |
| @@ -165,6 +168,11 @@ | |||
| 165 | #define MSR_PP1_ENERGY_STATUS 0x00000641 | 168 | #define MSR_PP1_ENERGY_STATUS 0x00000641 |
| 166 | #define MSR_PP1_POLICY 0x00000642 | 169 | #define MSR_PP1_POLICY 0x00000642 |
| 167 | 170 | ||
| 171 | #define MSR_PKG_WEIGHTED_CORE_C0_RES 0x00000658 | ||
| 172 | #define MSR_PKG_ANY_CORE_C0_RES 0x00000659 | ||
| 173 | #define MSR_PKG_ANY_GFXE_C0_RES 0x0000065A | ||
| 174 | #define MSR_PKG_BOTH_CORE_GFXE_C0_RES 0x0000065B | ||
| 175 | |||
| 168 | #define MSR_CORE_C1_RES 0x00000660 | 176 | #define MSR_CORE_C1_RES 0x00000660 |
| 169 | 177 | ||
| 170 | #define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668 | 178 | #define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668 |