Commit 61726144 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools arch x86: Sync the msr-index.h copy with the kernel sources 

To pick up the changes from these csets:

  7b8f40b3 ("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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 7b830875

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

+6 −0
Original line number Diff line number Diff line
@@ -705,12 +705,14 @@ 


#define PACKAGE_THERM_STATUS_PROCHOT		(1 << 0)

#define PACKAGE_THERM_STATUS_POWER_LIMIT	(1 << 10)

#define PACKAGE_THERM_STATUS_HFI_UPDATED	(1 << 26)



#define MSR_IA32_PACKAGE_THERM_INTERRUPT	0x000001b2



#define PACKAGE_THERM_INT_HIGH_ENABLE		(1 << 0)

#define PACKAGE_THERM_INT_LOW_ENABLE		(1 << 1)

#define PACKAGE_THERM_INT_PLN_ENABLE		(1 << 24)

#define PACKAGE_THERM_INT_HFI_ENABLE		(1 << 25)



/* Thermal Thresholds Support */

#define THERM_INT_THRESHOLD0_ENABLE    (1 << 15)
@@ -959,4 +961,8 @@ 
#define MSR_VM_IGNNE                    0xc0010115

#define MSR_VM_HSAVE_PA                 0xc0010117



/* Hardware Feedback Interface */

#define MSR_IA32_HW_FEEDBACK_PTR        0x17d0

#define MSR_IA32_HW_FEEDBACK_CONFIG     0x17d1



#endif /* _ASM_X86_MSR_INDEX_H */