Skip to content

Commit 6143374

Browse files
committed
tools arch x86: Sync the msr-index.h copy with the kernel sources
To pick up the changes from these csets: 159013a ("x86/its: Enumerate Indirect Target Selection (ITS) bug") f4138de ("x86/msr: Standardize on u64 in <asm/msr-index.h>") ec980e4 ("perf/x86/intel: Support auto counter reload") That cause no changes to tooling as it doesn't include a new MSR to be captured by the tools/perf/trace/beauty/tracepoints/x86_msr.sh script. Just silences this perf build warning: Warning: Kernel ABI header differences: diff -u tools/arch/x86/include/asm/msr-index.h arch/x86/include/asm/msr-index.h Cc: Adrian Hunter <[email protected]> Cc: Dave Hansen <[email protected]> Cc: Ian Rogers <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: James Clark <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Kan Liang <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Pawan Gupta <[email protected]> Cc: Peter Zijlstra <[email protected]> Link: https://lore.kernel.org/r/aEtAUg83OQGx8Kay@x1 Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 3417404 commit 6143374

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@
533533
#define MSR_HWP_CAPABILITIES 0x00000771
534534
#define MSR_HWP_REQUEST_PKG 0x00000772
535535
#define MSR_HWP_INTERRUPT 0x00000773
536-
#define MSR_HWP_REQUEST 0x00000774
536+
#define MSR_HWP_REQUEST 0x00000774
537537
#define MSR_HWP_STATUS 0x00000777
538538

539539
/* CPUID.6.EAX */
@@ -550,16 +550,16 @@
550550
#define HWP_LOWEST_PERF(x) (((x) >> 24) & 0xff)
551551

552552
/* IA32_HWP_REQUEST */
553-
#define HWP_MIN_PERF(x) (x & 0xff)
554-
#define HWP_MAX_PERF(x) ((x & 0xff) << 8)
553+
#define HWP_MIN_PERF(x) (x & 0xff)
554+
#define HWP_MAX_PERF(x) ((x & 0xff) << 8)
555555
#define HWP_DESIRED_PERF(x) ((x & 0xff) << 16)
556-
#define HWP_ENERGY_PERF_PREFERENCE(x) (((unsigned long long) x & 0xff) << 24)
556+
#define HWP_ENERGY_PERF_PREFERENCE(x) (((u64)x & 0xff) << 24)
557557
#define HWP_EPP_PERFORMANCE 0x00
558558
#define HWP_EPP_BALANCE_PERFORMANCE 0x80
559559
#define HWP_EPP_BALANCE_POWERSAVE 0xC0
560560
#define HWP_EPP_POWERSAVE 0xFF
561-
#define HWP_ACTIVITY_WINDOW(x) ((unsigned long long)(x & 0xff3) << 32)
562-
#define HWP_PACKAGE_CONTROL(x) ((unsigned long long)(x & 0x1) << 42)
561+
#define HWP_ACTIVITY_WINDOW(x) ((u64)(x & 0xff3) << 32)
562+
#define HWP_PACKAGE_CONTROL(x) ((u64)(x & 0x1) << 42)
563563

564564
/* IA32_HWP_STATUS */
565565
#define HWP_GUARANTEED_CHANGE(x) (x & 0x1)
@@ -602,7 +602,11 @@
602602
/* V6 PMON MSR range */
603603
#define MSR_IA32_PMC_V6_GP0_CTR 0x1900
604604
#define MSR_IA32_PMC_V6_GP0_CFG_A 0x1901
605+
#define MSR_IA32_PMC_V6_GP0_CFG_B 0x1902
606+
#define MSR_IA32_PMC_V6_GP0_CFG_C 0x1903
605607
#define MSR_IA32_PMC_V6_FX0_CTR 0x1980
608+
#define MSR_IA32_PMC_V6_FX0_CFG_B 0x1982
609+
#define MSR_IA32_PMC_V6_FX0_CFG_C 0x1983
606610
#define MSR_IA32_PMC_V6_STEP 4
607611

608612
/* KeyID partitioning between MKTME and TDX */

0 commit comments

Comments
 (0)