tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'pm-tools'

* pm-tools:
x86: remove unused definition of MSR_NHM_PLATFORM_INFO
tools/power turbostat: use new name for MSR_PLATFORM_INFO

Rafael J. Wysocki d9f67dbc 8005c49d

+5 -6
+1 -2
arch/x86/include/asm/msr-index.h
··· 35 35 #define MSR_IA32_PERFCTR0 0x000000c1 36 36 #define MSR_IA32_PERFCTR1 0x000000c2 37 37 #define MSR_FSB_FREQ 0x000000cd 38 - #define MSR_NHM_PLATFORM_INFO 0x000000ce 38 + #define MSR_PLATFORM_INFO 0x000000ce 39 39 40 40 #define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 41 41 #define NHM_C3_AUTO_DEMOTE (1UL << 25) ··· 44 44 #define SNB_C1_AUTO_UNDEMOTE (1UL << 27) 45 45 #define SNB_C3_AUTO_UNDEMOTE (1UL << 28) 46 46 47 - #define MSR_PLATFORM_INFO 0x000000ce 48 47 #define MSR_MTRRcap 0x000000fe 49 48 #define MSR_IA32_BBL_CR_CTL 0x00000119 50 49 #define MSR_IA32_BBL_CR_CTL3 0x0000011e
+4 -4
tools/power/x86/turbostat/turbostat.c
··· 1173 1173 unsigned long long msr; 1174 1174 unsigned int ratio; 1175 1175 1176 - get_msr(base_cpu, MSR_NHM_PLATFORM_INFO, &msr); 1176 + get_msr(base_cpu, MSR_PLATFORM_INFO, &msr); 1177 1177 1178 - fprintf(stderr, "cpu%d: MSR_NHM_PLATFORM_INFO: 0x%08llx\n", base_cpu, msr); 1178 + fprintf(stderr, "cpu%d: MSR_PLATFORM_INFO: 0x%08llx\n", base_cpu, msr); 1179 1179 1180 1180 ratio = (msr >> 40) & 0xFF; 1181 1181 fprintf(stderr, "%d * %.0f = %.0f MHz max efficiency frequency\n", ··· 1807 1807 * 1808 1808 * MSR_SMI_COUNT 0x00000034 1809 1809 * 1810 - * MSR_NHM_PLATFORM_INFO 0x000000ce 1810 + * MSR_PLATFORM_INFO 0x000000ce 1811 1811 * MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 1812 1812 * 1813 1813 * MSR_PKG_C3_RESIDENCY 0x000003f8 ··· 1876 1876 get_msr(base_cpu, MSR_NHM_SNB_PKG_CST_CFG_CTL, &msr); 1877 1877 pkg_cstate_limit = pkg_cstate_limits[msr & 0xF]; 1878 1878 1879 - get_msr(base_cpu, MSR_NHM_PLATFORM_INFO, &msr); 1879 + get_msr(base_cpu, MSR_PLATFORM_INFO, &msr); 1880 1880 base_ratio = (msr >> 8) & 0xFF; 1881 1881 1882 1882 base_hz = base_ratio * bclk * 1000000;