Commit 768d134d authored by Jim Mattson's avatar Jim Mattson Committed by Paolo Bonzini
Browse files

KVM: selftests: Introduce x2APIC register manipulation functions 



Standardize reads and writes of the x2APIC MSRs.

Signed-off-by: default avatarJim Mattson <jmattson@google.com>
Reviewed-by: default avatarOliver Upton <oupton@google.com>
Message-Id: <20210604172611.281819-11-jmattson@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 4c63c923

tools/testing/selftests/kvm/include/x86_64/apic.h

+10 −0
Original line number Diff line number Diff line
@@ -78,4 +78,14 @@ static inline void xapic_write_reg(unsigned int reg, uint32_t val) 
	((volatile uint32_t *)APIC_DEFAULT_GPA)[reg >> 2] = val;

}



static inline uint64_t x2apic_read_reg(unsigned int reg)

{

	return rdmsr(APIC_BASE_MSR + (reg >> 4));

}



static inline void x2apic_write_reg(unsigned int reg, uint64_t value)

{

	wrmsr(APIC_BASE_MSR + (reg >> 4), value);

}



#endif /* SELFTEST_KVM_APIC_H */

tools/testing/selftests/kvm/lib/x86_64/apic.c

+2 −3
Original line number Diff line number Diff line
@@ -38,9 +38,8 @@ void xapic_enable(void) 


void x2apic_enable(void)

{

	uint32_t spiv_reg = APIC_BASE_MSR + (APIC_SPIV >> 4);



	wrmsr(MSR_IA32_APICBASE, rdmsr(MSR_IA32_APICBASE) |

	      MSR_IA32_APICBASE_ENABLE | MSR_IA32_APICBASE_EXTD);

	wrmsr(spiv_reg, rdmsr(spiv_reg) | APIC_SPIV_APIC_ENABLED);

	x2apic_write_reg(APIC_SPIV,

			 x2apic_read_reg(APIC_SPIV) | APIC_SPIV_APIC_ENABLED);

}

tools/testing/selftests/kvm/x86_64/smm_test.c

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static inline void sync_with_host(uint64_t phase) 


void self_smi(void)

{

	wrmsr(APIC_BASE_MSR + (APIC_ICR >> 4),

	x2apic_write_reg(APIC_ICR,

			 APIC_DEST_SELF | APIC_INT_ASSERT | APIC_DM_SMI);

}