tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
KVM: selftests: Introduce x2APIC register manipulation functions
Standardize reads and writes of the x2APIC MSRs.
Signed-off-by: Jim Mattson <jmattson@google.com>
Reviewed-by: Oliver Upton <oupton@google.com>
Message-Id: <20210604172611.281819-11-jmattson@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
authored by
Jim Mattson
and committed by
Paolo Bonzini
768d134d
4c63c923
+14
-5
+10
tools/testing/selftests/kvm/include/x86_64/apic.h
+10
tools/testing/selftests/kvm/include/x86_64/apic.h
···
78
78
((volatile uint32_t *)APIC_DEFAULT_GPA)[reg >> 2] = val;
79
79
}
80
80
81
+
static inline uint64_t x2apic_read_reg(unsigned int reg)
82
+
{
83
+
return rdmsr(APIC_BASE_MSR + (reg >> 4));
84
+
}
85
+
86
+
static inline void x2apic_write_reg(unsigned int reg, uint64_t value)
87
+
{
88
+
wrmsr(APIC_BASE_MSR + (reg >> 4), value);
89
+
}
90
+
81
91
#endif /* SELFTEST_KVM_APIC_H */
+2
-3
tools/testing/selftests/kvm/lib/x86_64/apic.c
+2
-3
tools/testing/selftests/kvm/lib/x86_64/apic.c
···
38
38
39
39
void x2apic_enable(void)
40
40
{
41
-
uint32_t spiv_reg = APIC_BASE_MSR + (APIC_SPIV >> 4);
42
-
43
41
wrmsr(MSR_IA32_APICBASE, rdmsr(MSR_IA32_APICBASE) |
44
42
MSR_IA32_APICBASE_ENABLE | MSR_IA32_APICBASE_EXTD);
45
-
wrmsr(spiv_reg, rdmsr(spiv_reg) | APIC_SPIV_APIC_ENABLED);
43
+
x2apic_write_reg(APIC_SPIV,
44
+
x2apic_read_reg(APIC_SPIV) | APIC_SPIV_APIC_ENABLED);
46
45
}
+2
-2
tools/testing/selftests/kvm/x86_64/smm_test.c
+2
-2
tools/testing/selftests/kvm/x86_64/smm_test.c