From 5fa9e76469b474f47bf218b8c39cda75c60826fd Mon Sep 17 00:00:00 2001 From: Anisetti Avinash Krishna Date: Tue, 22 Apr 2025 09:44:26 +0530 Subject: [PATCH] arch: x86: core: intel64: Exclude apic_id comparison for ACRN This ASSERT fails because the comparison is made between the physical APIC ID and the virtual CPU's LAPIC ID. If CPU-1 is assigned to ACRN, it considers that CPU as its CPU-0. Signed-off-by: Anisetti Avinash Krishna --- arch/x86/core/intel64/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/core/intel64/cpu.c b/arch/x86/core/intel64/cpu.c index 8d68afa2a19..31dbf060d6c 100644 --- a/arch/x86/core/intel64/cpu.c +++ b/arch/x86/core/intel64/cpu.c @@ -97,7 +97,7 @@ void arch_cpu_start(int cpu_num, k_thread_stack_t *stack, int sz, */ FUNC_NORETURN void z_x86_cpu_init(struct x86_cpuboot *cpuboot) { -#if defined(CONFIG_ACPI) +#if defined(CONFIG_ACPI) && !defined(CONFIG_ACRN_COMMON) __ASSERT(z_x86_cpuid_get_current_physical_apic_id() == x86_cpu_loapics[cpuboot->cpu_id], "APIC ID miss match!"); #endif