Skip to content

Commit 4ddd758

Browse files
committed
tools arch x86: Sync the msr-index.h copy with the kernel sources
To pick up the changes from these csets: 9073428 ("x86/sev: Allow IBPB-on-Entry feature for SNP guests") 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: Borislav Petkov (AMD) <[email protected]> Cc: Kim Phillips <[email protected]> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent f8e478e commit 4ddd758

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,10 @@
740740
#define MSR_AMD64_SNP_SMT_PROT BIT_ULL(MSR_AMD64_SNP_SMT_PROT_BIT)
741741
#define MSR_AMD64_SNP_SECURE_AVIC_BIT 18
742742
#define MSR_AMD64_SNP_SECURE_AVIC BIT_ULL(MSR_AMD64_SNP_SECURE_AVIC_BIT)
743-
#define MSR_AMD64_SNP_RESV_BIT 19
743+
#define MSR_AMD64_SNP_RESERVED_BITS19_22 GENMASK_ULL(22, 19)
744+
#define MSR_AMD64_SNP_IBPB_ON_ENTRY_BIT 23
745+
#define MSR_AMD64_SNP_IBPB_ON_ENTRY BIT_ULL(MSR_AMD64_SNP_IBPB_ON_ENTRY_BIT)
746+
#define MSR_AMD64_SNP_RESV_BIT 24
744747
#define MSR_AMD64_SNP_RESERVED_MASK GENMASK_ULL(63, MSR_AMD64_SNP_RESV_BIT)
745748
#define MSR_AMD64_SAVIC_CONTROL 0xc0010138
746749
#define MSR_AMD64_SAVIC_EN_BIT 0

0 commit comments

Comments
 (0)