• Arnaldo Carvalho de Melo's avatar
    tools arch x86: Sync the msr-index.h copy with the kernel sources · d8e3ee2e
    Arnaldo Carvalho de Melo authored
    To pick up the changes from these csets:
    
      21b5ee59 ("x86/cpu/amd: Enable the fixed Instructions Retired counter IRPERF")
    
      $ 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
      $ git diff
      diff --git a/tools/arch/x86/include/asm/msr-index.h b/tools/arch/x86/include/asm/msr-index.h
      index ebe1685e92dd..d5e517d1c3dd 100644
      --- a/tools/arch/x86/include/asm/msr-index.h
      +++ b/tools/arch/x86/include/asm/msr-index.h
      @@ -512,6 +512,8 @@
       #define MSR_K7_HWCR                    0xc0010015
       #define MSR_K7_HWCR_SMMLOCK_BIT                0
       #define MSR_K7_HWCR_SMMLOCK            BIT_ULL(MSR_K7_HWCR_SMMLOCK_BIT)
      +#define MSR_K7_HWCR_IRPERF_EN_BIT      30
      +#define MSR_K7_HWCR_IRPERF_EN          BIT_ULL(MSR_K7_HWCR_IRPERF_EN_BIT)
       #define MSR_K7_FID_VID_CTL             0xc0010041
       #define MSR_K7_FID_VID_STATUS          0xc0010042
      $
    
    That don't result in any change in tooling:
    
      $ tools/perf/trace/beauty/tracepoints/x86_msr.sh > after
      $ diff -u before after
      $
    
    To silence 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: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Borislav Petkov <bp@suse.de>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Kim Phillips <kim.phillips@amd.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
    d8e3ee2e
msr-index.h 32.7 KB