Skip to content

Commit 6172614

Browse files
committed
tools arch x86: Sync the msr-index.h copy with the kernel sources
To pick up the changes from these csets: 7b8f40b ("x86/cpu: Add definitions for the Intel Hardware Feedback Interface") That cause no changes to tooling: $ tools/perf/trace/beauty/tracepoints/x86_msr.sh > before $ cp arch/x86/include/asm/msr-index.h tools/arch/x86/include/asm/msr-index.h $ tools/perf/trace/beauty/tracepoints/x86_msr.sh > after $ diff -u before after $ Just silences this perf build warning: Warning: Kernel ABI header at 'tools/arch/x86/include/asm/msr-index.h' differs from latest version at 'arch/x86/include/asm/msr-index.h' diff -u tools/arch/x86/include/asm/msr-index.h arch/x86/include/asm/msr-index.h Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Cc: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> Link: https://lore.kernel.org/lkml/YjzVt8CjAORAsTCo@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent 7b83087 commit 6172614

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

tools/arch/x86/include/asm/msr-index.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -705,12 +705,14 @@
705705

706706
#define PACKAGE_THERM_STATUS_PROCHOT (1 << 0)
707707
#define PACKAGE_THERM_STATUS_POWER_LIMIT (1 << 10)
708+
#define PACKAGE_THERM_STATUS_HFI_UPDATED (1 << 26)
708709

709710
#define MSR_IA32_PACKAGE_THERM_INTERRUPT 0x000001b2
710711

711712
#define PACKAGE_THERM_INT_HIGH_ENABLE (1 << 0)
712713
#define PACKAGE_THERM_INT_LOW_ENABLE (1 << 1)
713714
#define PACKAGE_THERM_INT_PLN_ENABLE (1 << 24)
715+
#define PACKAGE_THERM_INT_HFI_ENABLE (1 << 25)
714716

715717
/* Thermal Thresholds Support */
716718
#define THERM_INT_THRESHOLD0_ENABLE (1 << 15)
@@ -959,4 +961,8 @@
959961
#define MSR_VM_IGNNE 0xc0010115
960962
#define MSR_VM_HSAVE_PA 0xc0010117
961963

964+
/* Hardware Feedback Interface */
965+
#define MSR_IA32_HW_FEEDBACK_PTR 0x17d0
966+
#define MSR_IA32_HW_FEEDBACK_CONFIG 0x17d1
967+
962968
#endif /* _ASM_X86_MSR_INDEX_H */

0 commit comments

Comments
 (0)