OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

dm: fixed a bug where mptable failed to wake up CPU1# when adding acpi=off into User VM cmdline 

Previous commit introduced the "use physical APIC IDs as vLAPIC IDs for VMs" change,
but it didn't update the apic_id in mptable. Changed the mptable code to also
set apic_id to physical APIC ID to fix the bug

Tracked-On: #7146
Signed-off-by: dongshen <dongsheng.x.zhang@intel.com>
This commit is contained in:
dongshen 2022-02-24 16:22:51 -08:00 committed by acrnsi-robot
parent 723f86a578
commit ce7b38ee04
1 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
devicemodel/core/mptbl.c
View File

@ -34,6 +34,7 @@
#include "acpi.h"
#include "dm.h"
#include "pci_core.h"
#include "vmmapi.h"
#define MPTABLE_BASE 0xF0000
@ -117,11 +118,39 @@ static void
mpt_build_proc_entries(proc_entry_ptr mpep, int ncpu)
{
int i;
uint64_t guest_pcpu_bitmask = vm_get_cpu_affinity_dm();
if (guest_pcpu_bitmask == 0) {
pr_err("%s,Err: Invalid guest_pcpu_bitmask.\n", __func__);
return;
}
pr_info("%s, guest_cpu_bitmask: 0x%x\n", __func__, guest_pcpu_bitmask);
for (i = 0; i < ncpu; i++) {
int pcpu_id = pcpuid_from_vcpuid(guest_pcpu_bitmask, i);
int lapic_id;
if (pcpu_id < 0) {
pr_err("%s,Err: pcpu id is not found in guest_pcpu_bitmask.\n", __func__);
return;
}
assert(pcpu_id < ACRN_PLATFORM_LAPIC_IDS_MAX);
if (pcpu_id >= ACRN_PLATFORM_LAPIC_IDS_MAX) {
pr_err("%s,Err: pcpu id %u should be less than ACRN_PLATFORM_LAPIC_IDS_MAX.\n", __func__, pcpu_id);
return;
}
lapic_id = lapicid_from_pcpuid(pcpu_id);
if (lapic_id == -1) {
pr_err("Failed to retrieve the local APIC ID for pCPU %u\n", pcpu_id);
return;
}
memset(mpep, 0, sizeof(*mpep));
mpep->type = MPCT_ENTRY_PROCESSOR;
mpep->apic_id = i; /* XXX */
mpep->apic_id = lapic_id;
mpep->apic_version = LAPIC_VERSION;
mpep->cpu_flags = PROCENTRY_FLAG_EN;
if (i == 0)