github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-04-28 19:54:01 +00:00
Code Issues Projects Releases Wiki Activity

hv: fix cpuid 0x2 mismatch when launch RTVM use atom core

Browse Source 
When CPUID executes with EAX set to 02H, the processor returns information about cache and TLB information.
This information is percpu related, and should be obtained directly from the physical cpu.

Tracked-On: #6931
Signed-off-by: Tw <wei.tan@intel.com>
This commit is contained in:
Tw 2021-11-25 09:50:40 +08:00 committed by acrnsi-robot
parent 430fc6327d
commit fc7e26dde8
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hypervisor/arch/x86/guest/vcpuid.c
View File

@ -510,7 +510,7 @@ int32_t set_vcpuid_entries(struct acrn_vm *vm)
for (i = 1U; i <= limit; i++) {
/* these are percpu related */
if ((i == 1U) || (i == 0xbU) || (i == 0xdU) || (i == 0x19U) || (i == 0x1aU)) {
if ((i == 1U) || (i == 0xbU) || (i == 0xdU) || (i == 0x19U) || (i == 0x1aU) || (i == 2U)) {
continue;
}
@ -606,7 +606,7 @@ int32_t set_vcpuid_entries(struct acrn_vm *vm)
static inline bool is_percpu_related(uint32_t leaf)
{
return ((leaf == 0x1U) || (leaf == 0xbU) || (leaf == 0xdU) || (leaf == 0x19U) || (leaf == 0x1aU) || (leaf == 0x80000001U));
return ((leaf == 0x1U) || (leaf == 0xbU) || (leaf == 0xdU) || (leaf == 0x19U) || (leaf == 0x1aU) || (leaf == 0x2U) || (leaf == 0x80000001U));
}
static void guest_cpuid_01h(struct acrn_vcpu *vcpu, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx)
@ -764,6 +764,12 @@ static void guest_cpuid_1ah(uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_
cpuid_subleaf(0x1aU, *ecx, eax, ebx, ecx, edx);
}
static void guest_cpuid_02h(uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx)
{
/* Cache and TLB Information Enumeration Leaf (EAX = 02H, ECX = 0) */
cpuid_subleaf(0x2U, *ecx, eax, ebx, ecx, edx);
}
static void guest_cpuid_80000001h(const struct acrn_vcpu *vcpu,
uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx)
{
@ -851,6 +857,10 @@ void guest_cpuid(struct acrn_vcpu *vcpu, uint32_t *eax, uint32_t *ebx, uint32_t
guest_cpuid_1ah(eax, ebx, ecx, edx);
break;
case 0x02U:
guest_cpuid_02h(eax, ebx, ecx, edx);
break;
case 0x80000001U:
guest_cpuid_80000001h(vcpu, eax, ebx, ecx, edx);
break;