diff --git a/cpupower-4.6.tar.bz2 b/cpupower-4.6.tar.bz2 index bfbe4d9..5651310 100644 --- a/cpupower-4.6.tar.bz2 +++ b/cpupower-4.6.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3ce942da463f4e99f7ae32f258666af07489d2b42e2d34c5b8cfddbd76dfb22 -size 71387 +oid sha256:45560da27bf61e7be1f9835f1fc2648edd1b341568b0f1f093eb9f4224a9d5ed +size 71450 diff --git a/cpupower.changes b/cpupower.changes index 37b96a2..71c8597 100644 --- a/cpupower.changes +++ b/cpupower.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Apr 28 12:28:09 UTC 2016 - trenn@suse.de + +- Update turbostat to version 4.12 +- Update cpupower to latest sources +- Let turbostat only build against a local msr-index.h + Also add the msr-index.h export to the tarball from git repo script +*Delete make_header_file_passable_from_outside.patch + ------------------------------------------------------------------- Wed Apr 20 13:16:43 UTC 2016 - trenn@suse.de diff --git a/cpupower.spec b/cpupower.spec index ba336b0..aa1f117 100644 --- a/cpupower.spec +++ b/cpupower.spec @@ -22,7 +22,7 @@ Name: cpupower %define version %(rpm -q --qf '%{VERSION}' kernel-source) Version: 4.6 Release: 0 -%define tsversion 4.8 +%define tsversion 4.12 Summary: Tools to determine and set CPU Power related Settings License: GPL-2.0 Group: System/Base @@ -30,15 +30,10 @@ Url: https://git.kernel.org/cgit/linux/kernel/git/rafael/linux-pm.git Source: %{name}-%{version}.tar.bz2 Source1: turbostat-%{tsversion}.tar.bz2 Source2: cpupower_export_tarball_from_git.sh -Source3: msr-index.h Patch1: library_cleanup.patch Patch20: turbostat_fix_man_perm.patch -Patch21: make_header_file_passable_from_outside.patch Patch22: turbostat_set_asm_header_fixed.patch -%if 0%{?suse_version} > 1315 -BuildRequires: linux-glibc-devel -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gettext-tools BuildRequires: pciutils @@ -86,10 +81,7 @@ powersave module. %patch1 -p1 cd ../turbostat-%{tsversion} %patch20 -p1 -%patch21 -p1 -%if 0%{?suse_version} <= 1315 %patch22 -p1 -%endif %build # This package failed when testing with -Wl,-as-needed being default. @@ -101,10 +93,8 @@ make $CONF %{?_smp_mflags} %ifarch ix86 x86_64 cd ../turbostat-%{tsversion} -%if 0%{?suse_version} <= 1315 -cp %{SOURCE3} . -%endif -CFLAGS="%optflags -I. -DMSRHEADER=\"\"" make %{?_smp_mflags} +export CFLAGS="%optflags -I ." +make %{?_smp_mflags} %endif %install diff --git a/cpupower_export_tarball_from_git.sh b/cpupower_export_tarball_from_git.sh index 5120e1a..2df3e21 100644 --- a/cpupower_export_tarball_from_git.sh +++ b/cpupower_export_tarball_from_git.sh @@ -56,18 +56,19 @@ tar -cvjf cpupower${VERSION}.tar.bz2 cpupower${VERSION} popd TDIR=`mktemp -d` pushd "$TDIR" -set -x + git archive --format=tar $GIT_TAG tools/power/x86/turbostat |tar -x -mv tools/power/x86/turbostat turbostat${VERSION} -mkdir turbostat${VERSION}/asm +TURBOSTAT_VERSION=$(grep "turbostat version" tools/power/x86/turbostat/turbostat.c |grep fprintf |sed 's/.*turbostat version \([0-9].[0-9][0-9]\).*/\1/') +TURBOSTAT_VERSION=$(echo "-$TURBOSTAT_VERSION") +mv tools/power/x86/turbostat turbostat${TURBOSTAT_VERSION} [ ! -e "$GIT_DIR"/../arch/x86/include/asm/msr-index.h ] && echo "msr-index.h does not exist" && exit 1 -cp "$GIT_DIR"/../arch/x86/include/uapi/asm/msr-index.h turbostat${VERSION}/asm -tar -cvjf turbostat${VERSION}.tar.bz2 turbostat${VERSION} +cp "$GIT_DIR"/../arch/x86/include/asm/msr-index.h turbostat${TURBOSTAT_VERSION} +tar -cvjf turbostat${TURBOSTAT_VERSION}.tar.bz2 turbostat${TURBOSTAT_VERSION} popd mv "$DIR/cpupower${VERSION}".tar.bz2 . rm -rf "$DIR" -mv "$TDIR/turbostat${VERSION}".tar.bz2 . +mv "$TDIR/turbostat${TURBOSTAT_VERSION}".tar.bz2 . rm -rf "$TDIR" # set +x echo cpupower${VERSION}.tar.bz2 -echo turbostat${VERSION}.tar.bz2 +echo turbostat${TURBOSTAT_VERSION}.tar.bz2 diff --git a/library_cleanup.patch b/library_cleanup.patch index 065c761..4b6c905 100644 --- a/library_cleanup.patch +++ b/library_cleanup.patch @@ -1,43 +1,8 @@ -cpupower: Add cpuidle parts into library - -cpupower was built from cpufrequtils and enhanced by quite some neat cpuidle -userspace tools. - -Now the cpu idle functions have been separated and added to the cpupower.so -library. - -Here again pasted for better review of the interfaces: - -====================================== -int cpuidle_is_state_disabled(unsigned int cpu, - unsigned int idlestate); -int cpuidle_state_disable(unsigned int cpu, unsigned int idlestate, - unsigned int disable); -unsigned long cpuidle_state_latency(unsigned int cpu, - unsigned int idlestate); -unsigned long cpuidle_state_usage(unsigned int cpu, - unsigned int idlestate); -unsigned long long cpuidle_state_time(unsigned int cpu, - unsigned int idlestate); -char *cpuidle_state_name(unsigned int cpu, - unsigned int idlestate); -char *cpuidle_state_desc(unsigned int cpu, - unsigned int idlestate); -unsigned int cpuidle_state_count(unsigned int cpu); - -char *cpuidle_get_governor(void); -char *cpuidle_get_driver(void); - -====================================== - - -Signed-off-by: Thomas Renninger - diff --git a/Makefile b/Makefile -index 2e2ba2e..1ca525d 100644 +index 0adaf0c..8358863 100644 --- a/Makefile +++ b/Makefile -@@ -58,7 +58,7 @@ DESTDIR ?= +@@ -63,7 +63,7 @@ DESTDIR ?= # and _should_ modify the PACKAGE_BUGREPORT definition VERSION= $(shell ./utils/version-gen.sh) @@ -46,7 +11,7 @@ index 2e2ba2e..1ca525d 100644 LIB_MIN= 0 PACKAGE = cpupower -@@ -124,7 +124,7 @@ WARNINGS += -Wshadow +@@ -129,7 +129,7 @@ WARNINGS += -Wshadow CFLAGS += -DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PACKAGE)\" \ -DPACKAGE_BUGREPORT=\"$(PACKAGE_BUGREPORT)\" -D_GNU_SOURCE @@ -55,7 +20,7 @@ index 2e2ba2e..1ca525d 100644 utils/helpers/sysfs.o utils/helpers/misc.o utils/helpers/cpuid.o \ utils/helpers/pci.o utils/helpers/bitmask.o \ utils/idle_monitor/nhm_idle.o utils/idle_monitor/snb_idle.o \ -@@ -143,9 +143,9 @@ UTIL_HEADERS = utils/helpers/helpers.h utils/idle_monitor/cpupower-monitor.h \ +@@ -148,9 +148,9 @@ UTIL_HEADERS = utils/helpers/helpers.h utils/idle_monitor/cpupower-monitor.h \ utils/helpers/bitmask.h \ utils/idle_monitor/idle_monitors.h utils/idle_monitor/idle_monitors.def @@ -68,7 +33,7 @@ index 2e2ba2e..1ca525d 100644 LIB_OBJS := $(addprefix $(OUTPUT),$(LIB_OBJS)) CFLAGS += -pipe -@@ -265,6 +265,7 @@ install-lib: +@@ -280,6 +280,7 @@ install-lib: $(CP) $(OUTPUT)libcpupower.so* $(DESTDIR)${libdir}/ $(INSTALL) -d $(DESTDIR)${includedir} $(INSTALL_DATA) lib/cpufreq.h $(DESTDIR)${includedir}/cpufreq.h @@ -76,7 +41,7 @@ index 2e2ba2e..1ca525d 100644 install-tools: $(INSTALL) -d $(DESTDIR)${bindir} -@@ -296,6 +297,7 @@ install: all install-lib install-tools install-man $(INSTALL_NLS) $(INSTALL_BENC +@@ -315,6 +316,7 @@ endif uninstall: - rm -f $(DESTDIR)${libdir}/libcpupower.* - rm -f $(DESTDIR)${includedir}/cpufreq.h @@ -2337,28 +2302,6 @@ index c76a5e0..0000000 -extern int sysfs_modify_freq_policy_governor(unsigned int cpu, char *governor); -extern int sysfs_set_frequency(unsigned int cpu, - unsigned long target_frequency); -diff --git a/utils/cpufreq-info.c b/utils/cpufreq-info.c -index 0e67643..e9679f4 100644 ---- a/utils/cpufreq-info.c -+++ b/utils/cpufreq-info.c -@@ -256,7 +256,7 @@ static void debug_output_one(unsigned int cpu) - struct cpufreq_available_governors *governors; - struct cpufreq_stats *stats; - -- if (cpufreq_cpu_exists(cpu)) -+ if (cpupower_is_cpu_online(cpu)) - return; - - freq_kernel = cpufreq_get_freq_kernel(cpu); -@@ -647,7 +647,7 @@ int cmd_freq_info(int argc, char **argv) - - if (!bitmask_isbitset(cpus_chosen, cpu)) - continue; -- if (cpufreq_cpu_exists(cpu)) { -+ if (cpupower_is_cpu_online(cpu)) { - printf(_("couldn't analyze CPU %d as it doesn't seem to be present\n"), cpu); - continue; - } diff --git a/utils/cpufreq-set.c b/utils/cpufreq-set.c index 0fbd1a2..b4bf769 100644 --- a/utils/cpufreq-set.c @@ -2396,30 +2339,31 @@ index 0fbd1a2..b4bf769 100644 printf(_("Setting cpu: %d\n"), cpu); diff --git a/utils/cpuidle-info.c b/utils/cpuidle-info.c -index 750c1d8..8473ec4 100644 +index 8bf8ab5..b59c85d 100644 --- a/utils/cpuidle-info.c +++ b/utils/cpuidle-info.c -@@ -13,9 +13,9 @@ +@@ -13,8 +13,10 @@ #include #include - #include -+#include - #include "helpers/helpers.h" --#include "helpers/sysfs.h" +-#include "helpers/helpers.h" ++#include ++ + #include "helpers/sysfs.h" ++#include "helpers/helpers.h" #include "helpers/bitmask.h" #define LINE_LEN 10 -@@ -27,7 +27,7 @@ static void cpuidle_cpu_output(unsigned int cpu, int verbose) - - printf(_ ("Analyzing CPU %d:\n"), cpu); +@@ -24,7 +26,7 @@ static void cpuidle_cpu_output(unsigned int cpu, int verbose) + unsigned int idlestates, idlestate; + char *tmp; - idlestates = sysfs_get_idlestate_count(cpu); + idlestates = cpuidle_state_count(cpu); if (idlestates == 0) { printf(_("CPU %u: No idle states\n"), cpu); return; -@@ -36,7 +36,7 @@ static void cpuidle_cpu_output(unsigned int cpu, int verbose) +@@ -33,7 +35,7 @@ static void cpuidle_cpu_output(unsigned int cpu, int verbose) printf(_("Number of idle states: %d\n"), idlestates); printf(_("Available idle states:")); for (idlestate = 0; idlestate < idlestates; idlestate++) { @@ -2428,7 +2372,7 @@ index 750c1d8..8473ec4 100644 if (!tmp) continue; printf(" %s", tmp); -@@ -48,28 +48,28 @@ static void cpuidle_cpu_output(unsigned int cpu, int verbose) +@@ -45,28 +47,28 @@ static void cpuidle_cpu_output(unsigned int cpu, int verbose) return; for (idlestate = 0; idlestate < idlestates; idlestate++) { @@ -2461,9 +2405,9 @@ index 750c1d8..8473ec4 100644 - sysfs_get_idlestate_time(cpu, idlestate)); + cpuidle_state_time(cpu, idlestate)); } - printf("\n"); } -@@ -78,7 +78,7 @@ static void cpuidle_general_output(void) + +@@ -74,7 +76,7 @@ static void cpuidle_general_output(void) { char *tmp; @@ -2472,7 +2416,7 @@ index 750c1d8..8473ec4 100644 if (!tmp) { printf(_("Could not determine cpuidle driver\n")); return; -@@ -87,7 +87,7 @@ static void cpuidle_general_output(void) +@@ -83,7 +85,7 @@ static void cpuidle_general_output(void) printf(_("CPUidle driver: %s\n"), tmp); free(tmp); @@ -2481,7 +2425,7 @@ index 750c1d8..8473ec4 100644 if (!tmp) { printf(_("Could not determine cpuidle governor\n")); return; -@@ -102,7 +102,7 @@ static void proc_cpuidle_cpu_output(unsigned int cpu) +@@ -98,7 +100,7 @@ static void proc_cpuidle_cpu_output(unsigned int cpu) long max_allowed_cstate = 2000000000; unsigned int cstate, cstates; @@ -2490,7 +2434,7 @@ index 750c1d8..8473ec4 100644 if (cstates == 0) { printf(_("CPU %u: No C-states info\n"), cpu); return; -@@ -117,11 +117,11 @@ static void proc_cpuidle_cpu_output(unsigned int cpu) +@@ -113,11 +115,11 @@ static void proc_cpuidle_cpu_output(unsigned int cpu) "type[C%d] "), cstate, cstate); printf(_("promotion[--] demotion[--] ")); printf(_("latency[%03lu] "), @@ -2505,15 +2449,6 @@ index 750c1d8..8473ec4 100644 } } -@@ -190,7 +190,7 @@ int cmd_idle_info(int argc, char **argv) - cpu <= bitmask_last(cpus_chosen); cpu++) { - - if (!bitmask_isbitset(cpus_chosen, cpu) || -- cpufreq_cpu_exists(cpu)) -+ cpupower_is_cpu_online(cpu)) - continue; - - switch (output_param) { diff --git a/utils/cpuidle-set.c b/utils/cpuidle-set.c index d6b6ae4..691c24d 100644 --- a/utils/cpuidle-set.c @@ -2602,55 +2537,6 @@ index d6b6ae4..691c24d 100644 (cpu, idlestate, 0); if (ret == 0) printf(_("Idlestate %u enabled on CPU %u\n"), idlestate, cpu); -diff --git a/utils/cpupower-info.c b/utils/cpupower-info.c -index 10299f2..0a02485 100644 ---- a/utils/cpupower-info.c -+++ b/utils/cpupower-info.c -@@ -13,8 +13,9 @@ - #include - - #include -+#include -+ - #include "helpers/helpers.h" --#include "helpers/sysfs.h" - - static struct option set_opts[] = { - {"perf-bias", optional_argument, NULL, 'b'}, -@@ -84,7 +85,7 @@ int cmd_info(int argc, char **argv) - cpu <= bitmask_last(cpus_chosen); cpu++) { - - if (!bitmask_isbitset(cpus_chosen, cpu) || -- cpufreq_cpu_exists(cpu)) -+ cpupower_is_cpu_online(cpu)) - continue; - - printf(_("analyzing CPU %d:\n"), cpu); -diff --git a/utils/cpupower-set.c b/utils/cpupower-set.c -index 3e6f374..cf24c09 100644 ---- a/utils/cpupower-set.c -+++ b/utils/cpupower-set.c -@@ -12,9 +12,9 @@ - #include - #include - --#include -+#include -+ - #include "helpers/helpers.h" --#include "helpers/sysfs.h" - #include "helpers/bitmask.h" - - static struct option set_opts[] = { -@@ -79,7 +79,7 @@ int cmd_set(int argc, char **argv) - cpu <= bitmask_last(cpus_chosen); cpu++) { - - if (!bitmask_isbitset(cpus_chosen, cpu) || -- cpufreq_cpu_exists(cpu)) -+ cpupower_is_cpu_online(cpu)) - continue; - - if (params.perf_bias) { diff --git a/utils/helpers/helpers.h b/utils/helpers/helpers.h index aa9e954..afb66f8 100644 --- a/utils/helpers/helpers.h diff --git a/make_header_file_passable_from_outside.patch b/make_header_file_passable_from_outside.patch deleted file mode 100644 index 7b2d30a..0000000 --- a/make_header_file_passable_from_outside.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: turbostat-4.8/Makefile -=================================================================== ---- turbostat-4.8.orig/Makefile 2016-01-26 18:26:10.350954918 +0100 -+++ turbostat-4.8/Makefile 2016-01-26 18:26:40.512676659 +0100 -@@ -9,7 +9,6 @@ endif - - turbostat : turbostat.c - CFLAGS += -Wall --CFLAGS += -DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"' - - %: %.c - @mkdir -p $(BUILD_OUTPUT) diff --git a/msr-index.h b/msr-index.h deleted file mode 100644 index afa6a00..0000000 --- a/msr-index.h +++ /dev/null @@ -1,694 +0,0 @@ -#ifndef _ASM_X86_MSR_INDEX_H -#define _ASM_X86_MSR_INDEX_H - -/* CPU model specific register (MSR) numbers */ - -/* x86-64 specific MSRs */ -#define MSR_EFER 0xc0000080 /* extended feature register */ -#define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target */ -#define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target */ -#define MSR_CSTAR 0xc0000083 /* compat mode SYSCALL target */ -#define MSR_SYSCALL_MASK 0xc0000084 /* EFLAGS mask for syscall */ -#define MSR_FS_BASE 0xc0000100 /* 64bit FS base */ -#define MSR_GS_BASE 0xc0000101 /* 64bit GS base */ -#define MSR_KERNEL_GS_BASE 0xc0000102 /* SwapGS GS shadow */ -#define MSR_TSC_AUX 0xc0000103 /* Auxiliary TSC */ - -/* EFER bits: */ -#define _EFER_SCE 0 /* SYSCALL/SYSRET */ -#define _EFER_LME 8 /* Long mode enable */ -#define _EFER_LMA 10 /* Long mode active (read-only) */ -#define _EFER_NX 11 /* No execute enable */ -#define _EFER_SVME 12 /* Enable virtualization */ -#define _EFER_LMSLE 13 /* Long Mode Segment Limit Enable */ -#define _EFER_FFXSR 14 /* Enable Fast FXSAVE/FXRSTOR */ - -#define EFER_SCE (1<<_EFER_SCE) -#define EFER_LME (1<<_EFER_LME) -#define EFER_LMA (1<<_EFER_LMA) -#define EFER_NX (1<<_EFER_NX) -#define EFER_SVME (1<<_EFER_SVME) -#define EFER_LMSLE (1<<_EFER_LMSLE) -#define EFER_FFXSR (1<<_EFER_FFXSR) - -/* Intel MSRs. Some also available on other CPUs */ -#define MSR_IA32_PERFCTR0 0x000000c1 -#define MSR_IA32_PERFCTR1 0x000000c2 -#define MSR_FSB_FREQ 0x000000cd -#define MSR_PLATFORM_INFO 0x000000ce - -#define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 -#define NHM_C3_AUTO_DEMOTE (1UL << 25) -#define NHM_C1_AUTO_DEMOTE (1UL << 26) -#define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25) -#define SNB_C1_AUTO_UNDEMOTE (1UL << 27) -#define SNB_C3_AUTO_UNDEMOTE (1UL << 28) - -#define MSR_MTRRcap 0x000000fe -#define MSR_IA32_BBL_CR_CTL 0x00000119 -#define MSR_IA32_BBL_CR_CTL3 0x0000011e - -#define MSR_IA32_SYSENTER_CS 0x00000174 -#define MSR_IA32_SYSENTER_ESP 0x00000175 -#define MSR_IA32_SYSENTER_EIP 0x00000176 - -#define MSR_IA32_MCG_CAP 0x00000179 -#define MSR_IA32_MCG_STATUS 0x0000017a -#define MSR_IA32_MCG_CTL 0x0000017b -#define MSR_IA32_MCG_EXT_CTL 0x000004d0 - -#define MSR_OFFCORE_RSP_0 0x000001a6 -#define MSR_OFFCORE_RSP_1 0x000001a7 -#define MSR_NHM_TURBO_RATIO_LIMIT 0x000001ad -#define MSR_IVT_TURBO_RATIO_LIMIT 0x000001ae -#define MSR_TURBO_RATIO_LIMIT 0x000001ad -#define MSR_TURBO_RATIO_LIMIT1 0x000001ae -#define MSR_TURBO_RATIO_LIMIT2 0x000001af - -#define MSR_LBR_SELECT 0x000001c8 -#define MSR_LBR_TOS 0x000001c9 -#define MSR_LBR_NHM_FROM 0x00000680 -#define MSR_LBR_NHM_TO 0x000006c0 -#define MSR_LBR_CORE_FROM 0x00000040 -#define MSR_LBR_CORE_TO 0x00000060 - -#define MSR_LBR_INFO_0 0x00000dc0 /* ... 0xddf for _31 */ -#define LBR_INFO_MISPRED BIT_ULL(63) -#define LBR_INFO_IN_TX BIT_ULL(62) -#define LBR_INFO_ABORT BIT_ULL(61) -#define LBR_INFO_CYCLES 0xffff - -#define MSR_IA32_PEBS_ENABLE 0x000003f1 -#define MSR_IA32_DS_AREA 0x00000600 -#define MSR_IA32_PERF_CAPABILITIES 0x00000345 -#define MSR_PEBS_LD_LAT_THRESHOLD 0x000003f6 - -#define MSR_IA32_RTIT_CTL 0x00000570 -#define RTIT_CTL_TRACEEN BIT(0) -#define RTIT_CTL_CYCLEACC BIT(1) -#define RTIT_CTL_OS BIT(2) -#define RTIT_CTL_USR BIT(3) -#define RTIT_CTL_CR3EN BIT(7) -#define RTIT_CTL_TOPA BIT(8) -#define RTIT_CTL_MTC_EN BIT(9) -#define RTIT_CTL_TSC_EN BIT(10) -#define RTIT_CTL_DISRETC BIT(11) -#define RTIT_CTL_BRANCH_EN BIT(13) -#define RTIT_CTL_MTC_RANGE_OFFSET 14 -#define RTIT_CTL_MTC_RANGE (0x0full << RTIT_CTL_MTC_RANGE_OFFSET) -#define RTIT_CTL_CYC_THRESH_OFFSET 19 -#define RTIT_CTL_CYC_THRESH (0x0full << RTIT_CTL_CYC_THRESH_OFFSET) -#define RTIT_CTL_PSB_FREQ_OFFSET 24 -#define RTIT_CTL_PSB_FREQ (0x0full << RTIT_CTL_PSB_FREQ_OFFSET) -#define MSR_IA32_RTIT_STATUS 0x00000571 -#define RTIT_STATUS_CONTEXTEN BIT(1) -#define RTIT_STATUS_TRIGGEREN BIT(2) -#define RTIT_STATUS_ERROR BIT(4) -#define RTIT_STATUS_STOPPED BIT(5) -#define MSR_IA32_RTIT_CR3_MATCH 0x00000572 -#define MSR_IA32_RTIT_OUTPUT_BASE 0x00000560 -#define MSR_IA32_RTIT_OUTPUT_MASK 0x00000561 - -#define MSR_MTRRfix64K_00000 0x00000250 -#define MSR_MTRRfix16K_80000 0x00000258 -#define MSR_MTRRfix16K_A0000 0x00000259 -#define MSR_MTRRfix4K_C0000 0x00000268 -#define MSR_MTRRfix4K_C8000 0x00000269 -#define MSR_MTRRfix4K_D0000 0x0000026a -#define MSR_MTRRfix4K_D8000 0x0000026b -#define MSR_MTRRfix4K_E0000 0x0000026c -#define MSR_MTRRfix4K_E8000 0x0000026d -#define MSR_MTRRfix4K_F0000 0x0000026e -#define MSR_MTRRfix4K_F8000 0x0000026f -#define MSR_MTRRdefType 0x000002ff - -#define MSR_IA32_CR_PAT 0x00000277 - -#define MSR_IA32_DEBUGCTLMSR 0x000001d9 -#define MSR_IA32_LASTBRANCHFROMIP 0x000001db -#define MSR_IA32_LASTBRANCHTOIP 0x000001dc -#define MSR_IA32_LASTINTFROMIP 0x000001dd -#define MSR_IA32_LASTINTTOIP 0x000001de - -/* DEBUGCTLMSR bits (others vary by model): */ -#define DEBUGCTLMSR_LBR (1UL << 0) /* last branch recording */ -#define DEBUGCTLMSR_BTF (1UL << 1) /* single-step on branches */ -#define DEBUGCTLMSR_TR (1UL << 6) -#define DEBUGCTLMSR_BTS (1UL << 7) -#define DEBUGCTLMSR_BTINT (1UL << 8) -#define DEBUGCTLMSR_BTS_OFF_OS (1UL << 9) -#define DEBUGCTLMSR_BTS_OFF_USR (1UL << 10) -#define DEBUGCTLMSR_FREEZE_LBRS_ON_PMI (1UL << 11) - -#define MSR_PEBS_FRONTEND 0x000003f7 - -#define MSR_IA32_POWER_CTL 0x000001fc - -#define MSR_IA32_MC0_CTL 0x00000400 -#define MSR_IA32_MC0_STATUS 0x00000401 -#define MSR_IA32_MC0_ADDR 0x00000402 -#define MSR_IA32_MC0_MISC 0x00000403 - -/* C-state Residency Counters */ -#define MSR_PKG_C3_RESIDENCY 0x000003f8 -#define MSR_PKG_C6_RESIDENCY 0x000003f9 -#define MSR_PKG_C7_RESIDENCY 0x000003fa -#define MSR_CORE_C3_RESIDENCY 0x000003fc -#define MSR_CORE_C6_RESIDENCY 0x000003fd -#define MSR_CORE_C7_RESIDENCY 0x000003fe -#define MSR_KNL_CORE_C6_RESIDENCY 0x000003ff -#define MSR_PKG_C2_RESIDENCY 0x0000060d -#define MSR_PKG_C8_RESIDENCY 0x00000630 -#define MSR_PKG_C9_RESIDENCY 0x00000631 -#define MSR_PKG_C10_RESIDENCY 0x00000632 - -/* Run Time Average Power Limiting (RAPL) Interface */ - -#define MSR_RAPL_POWER_UNIT 0x00000606 - -#define MSR_PKG_POWER_LIMIT 0x00000610 -#define MSR_PKG_ENERGY_STATUS 0x00000611 -#define MSR_PKG_PERF_STATUS 0x00000613 -#define MSR_PKG_POWER_INFO 0x00000614 - -#define MSR_DRAM_POWER_LIMIT 0x00000618 -#define MSR_DRAM_ENERGY_STATUS 0x00000619 -#define MSR_DRAM_PERF_STATUS 0x0000061b -#define MSR_DRAM_POWER_INFO 0x0000061c - -#define MSR_PP0_POWER_LIMIT 0x00000638 -#define MSR_PP0_ENERGY_STATUS 0x00000639 -#define MSR_PP0_POLICY 0x0000063a -#define MSR_PP0_PERF_STATUS 0x0000063b - -#define MSR_PP1_POWER_LIMIT 0x00000640 -#define MSR_PP1_ENERGY_STATUS 0x00000641 -#define MSR_PP1_POLICY 0x00000642 - -#define MSR_CONFIG_TDP_NOMINAL 0x00000648 -#define MSR_CONFIG_TDP_LEVEL_1 0x00000649 -#define MSR_CONFIG_TDP_LEVEL_2 0x0000064A -#define MSR_CONFIG_TDP_CONTROL 0x0000064B -#define MSR_TURBO_ACTIVATION_RATIO 0x0000064C - -#define MSR_PKG_WEIGHTED_CORE_C0_RES 0x00000658 -#define MSR_PKG_ANY_CORE_C0_RES 0x00000659 -#define MSR_PKG_ANY_GFXE_C0_RES 0x0000065A -#define MSR_PKG_BOTH_CORE_GFXE_C0_RES 0x0000065B - -#define MSR_CORE_C1_RES 0x00000660 - -#define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668 -#define MSR_MC6_DEMOTION_POLICY_CONFIG 0x00000669 - -#define MSR_CORE_PERF_LIMIT_REASONS 0x00000690 -#define MSR_GFX_PERF_LIMIT_REASONS 0x000006B0 -#define MSR_RING_PERF_LIMIT_REASONS 0x000006B1 - -/* Config TDP MSRs */ -#define MSR_CONFIG_TDP_NOMINAL 0x00000648 -#define MSR_CONFIG_TDP_LEVEL1 0x00000649 -#define MSR_CONFIG_TDP_LEVEL2 0x0000064A -#define MSR_CONFIG_TDP_CONTROL 0x0000064B -#define MSR_TURBO_ACTIVATION_RATIO 0x0000064C - -/* Hardware P state interface */ -#define MSR_PPERF 0x0000064e -#define MSR_PERF_LIMIT_REASONS 0x0000064f -#define MSR_PM_ENABLE 0x00000770 -#define MSR_HWP_CAPABILITIES 0x00000771 -#define MSR_HWP_REQUEST_PKG 0x00000772 -#define MSR_HWP_INTERRUPT 0x00000773 -#define MSR_HWP_REQUEST 0x00000774 -#define MSR_HWP_STATUS 0x00000777 - -/* CPUID.6.EAX */ -#define HWP_BASE_BIT (1<<7) -#define HWP_NOTIFICATIONS_BIT (1<<8) -#define HWP_ACTIVITY_WINDOW_BIT (1<<9) -#define HWP_ENERGY_PERF_PREFERENCE_BIT (1<<10) -#define HWP_PACKAGE_LEVEL_REQUEST_BIT (1<<11) - -/* IA32_HWP_CAPABILITIES */ -#define HWP_HIGHEST_PERF(x) (x & 0xff) -#define HWP_GUARANTEED_PERF(x) ((x & (0xff << 8)) >>8) -#define HWP_MOSTEFFICIENT_PERF(x) ((x & (0xff << 16)) >>16) -#define HWP_LOWEST_PERF(x) ((x & (0xff << 24)) >>24) - -/* IA32_HWP_REQUEST */ -#define HWP_MIN_PERF(x) (x & 0xff) -#define HWP_MAX_PERF(x) ((x & 0xff) << 8) -#define HWP_DESIRED_PERF(x) ((x & 0xff) << 16) -#define HWP_ENERGY_PERF_PREFERENCE(x) ((x & 0xff) << 24) -#define HWP_ACTIVITY_WINDOW(x) ((x & 0xff3) << 32) -#define HWP_PACKAGE_CONTROL(x) ((x & 0x1) << 42) - -/* IA32_HWP_STATUS */ -#define HWP_GUARANTEED_CHANGE(x) (x & 0x1) -#define HWP_EXCURSION_TO_MINIMUM(x) (x & 0x4) - -/* IA32_HWP_INTERRUPT */ -#define HWP_CHANGE_TO_GUARANTEED_INT(x) (x & 0x1) -#define HWP_EXCURSION_TO_MINIMUM_INT(x) (x & 0x2) - -#define MSR_AMD64_MC0_MASK 0xc0010044 - -#define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) -#define MSR_IA32_MCx_STATUS(x) (MSR_IA32_MC0_STATUS + 4*(x)) -#define MSR_IA32_MCx_ADDR(x) (MSR_IA32_MC0_ADDR + 4*(x)) -#define MSR_IA32_MCx_MISC(x) (MSR_IA32_MC0_MISC + 4*(x)) - -#define MSR_AMD64_MCx_MASK(x) (MSR_AMD64_MC0_MASK + (x)) - -/* These are consecutive and not in the normal 4er MCE bank block */ -#define MSR_IA32_MC0_CTL2 0x00000280 -#define MSR_IA32_MCx_CTL2(x) (MSR_IA32_MC0_CTL2 + (x)) - -#define MSR_P6_PERFCTR0 0x000000c1 -#define MSR_P6_PERFCTR1 0x000000c2 -#define MSR_P6_EVNTSEL0 0x00000186 -#define MSR_P6_EVNTSEL1 0x00000187 - -#define MSR_KNC_PERFCTR0 0x00000020 -#define MSR_KNC_PERFCTR1 0x00000021 -#define MSR_KNC_EVNTSEL0 0x00000028 -#define MSR_KNC_EVNTSEL1 0x00000029 - -/* Alternative perfctr range with full access. */ -#define MSR_IA32_PMC0 0x000004c1 - -/* AMD64 MSRs. Not complete. See the architecture manual for a more - complete list. */ - -#define MSR_AMD64_PATCH_LEVEL 0x0000008b -#define MSR_AMD64_TSC_RATIO 0xc0000104 -#define MSR_AMD64_NB_CFG 0xc001001f -#define MSR_AMD64_PATCH_LOADER 0xc0010020 -#define MSR_AMD64_OSVW_ID_LENGTH 0xc0010140 -#define MSR_AMD64_OSVW_STATUS 0xc0010141 -#define MSR_AMD64_LS_CFG 0xc0011020 -#define MSR_AMD64_DC_CFG 0xc0011022 -#define MSR_AMD64_BU_CFG2 0xc001102a -#define MSR_AMD64_IBSFETCHCTL 0xc0011030 -#define MSR_AMD64_IBSFETCHLINAD 0xc0011031 -#define MSR_AMD64_IBSFETCHPHYSAD 0xc0011032 -#define MSR_AMD64_IBSFETCH_REG_COUNT 3 -#define MSR_AMD64_IBSFETCH_REG_MASK ((1UL<