Skip to content

Commit 3ef9fec

Browse files
committed
tools arch x86: Sync the msr-index.h copy with the kernel sources
To pick up the changes from these csets: 8c29f01 ("x86/sev: Add SEV-SNP guest feature negotiation support") 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: Borislav Petkov (AMD) <[email protected]> Cc: Nikunj A Dadhania <[email protected]> Link: https://lore.kernel.org/lkml/Y%[email protected]/ Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent b48279a commit 3ef9fec

File tree

1 file changed

+20
-0
lines changed

1 file changed

+20
-0
lines changed

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,26 @@
566566
#define MSR_AMD64_SEV_ES_ENABLED BIT_ULL(MSR_AMD64_SEV_ES_ENABLED_BIT)
567567
#define MSR_AMD64_SEV_SNP_ENABLED BIT_ULL(MSR_AMD64_SEV_SNP_ENABLED_BIT)
568568

569+
/* SNP feature bits enabled by the hypervisor */
570+
#define MSR_AMD64_SNP_VTOM BIT_ULL(3)
571+
#define MSR_AMD64_SNP_REFLECT_VC BIT_ULL(4)
572+
#define MSR_AMD64_SNP_RESTRICTED_INJ BIT_ULL(5)
573+
#define MSR_AMD64_SNP_ALT_INJ BIT_ULL(6)
574+
#define MSR_AMD64_SNP_DEBUG_SWAP BIT_ULL(7)
575+
#define MSR_AMD64_SNP_PREVENT_HOST_IBS BIT_ULL(8)
576+
#define MSR_AMD64_SNP_BTB_ISOLATION BIT_ULL(9)
577+
#define MSR_AMD64_SNP_VMPL_SSS BIT_ULL(10)
578+
#define MSR_AMD64_SNP_SECURE_TSC BIT_ULL(11)
579+
#define MSR_AMD64_SNP_VMGEXIT_PARAM BIT_ULL(12)
580+
#define MSR_AMD64_SNP_IBS_VIRT BIT_ULL(14)
581+
#define MSR_AMD64_SNP_VMSA_REG_PROTECTION BIT_ULL(16)
582+
#define MSR_AMD64_SNP_SMT_PROTECTION BIT_ULL(17)
583+
584+
/* SNP feature bits reserved for future use. */
585+
#define MSR_AMD64_SNP_RESERVED_BIT13 BIT_ULL(13)
586+
#define MSR_AMD64_SNP_RESERVED_BIT15 BIT_ULL(15)
587+
#define MSR_AMD64_SNP_RESERVED_MASK GENMASK_ULL(63, 18)
588+
569589
#define MSR_AMD64_VIRT_SPEC_CTRL 0xc001011f
570590

571591
/* AMD Collaborative Processor Performance Control MSRs */

0 commit comments

Comments
 (0)