Commit 49c140d5 authored by Borislav Petkov's avatar Borislav Petkov Committed by Sean Christopherson
Browse files

KVM: x86: Sort CPUID_8000_0021_EAX leaf bits properly 



WRMSR_XX_BASE_NS is bit 1 so put it there, add some new bits as
comments only.

Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20250324160617.15379-1-bp@kernel.org


[sean: skip the FSRS/FSRC placeholders to avoid confusion]
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent f804dc6a

arch/x86/kvm/cpuid.c

+4 −1
Original line number Diff line number Diff line
@@ -1152,6 +1152,7 @@ void kvm_set_cpu_caps(void) 


	kvm_cpu_cap_init(CPUID_8000_0021_EAX,

		F(NO_NESTED_DATA_BP),

		F(WRMSR_XX_BASE_NS),

		/*

		 * Synthesize "LFENCE is serializing" into the AMD-defined entry

		 * in KVM's supported CPUID, i.e. if the feature is reported as
@@ -1165,10 +1166,12 @@ void kvm_set_cpu_caps(void) 
		SYNTHESIZED_F(LFENCE_RDTSC),

		/* SmmPgCfgLock */

		F(NULL_SEL_CLR_BASE),

		/* UpperAddressIgnore */

		F(AUTOIBRS),

		EMULATED_F(NO_SMM_CTL_MSR),

		/* PrefetchCtlMsr */

		F(WRMSR_XX_BASE_NS),

		/* GpOnUserCpuid */

		/* EPSF */

		SYNTHESIZED_F(SBPB),

		SYNTHESIZED_F(IBPB_BRTYPE),

		SYNTHESIZED_F(SRSO_NO),