arch: x86: core: intel64: Exclude apic_id comparison for ACRN

akanisetti · kartben · commit 5fa9e76469b4 · 2025-05-09T21:08:36.000+02:00
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 &lt;anisetti.avinash.krishna@intel.com&gt;
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ void arch_cpu_start(int cpu_num, k_thread_stack_t *stack, int sz,`
`97`	`97`	`*/`
`98`	`98`	`FUNC_NORETURN void z_x86_cpu_init(struct x86_cpuboot *cpuboot)`
`99`	`99`	`{`
`100`		`-#if defined(CONFIG_ACPI)`
	`100`	`+#if defined(CONFIG_ACPI) && !defined(CONFIG_ACRN_COMMON)`
`101`	`101`	`__ASSERT(z_x86_cpuid_get_current_physical_apic_id() ==`
`102`	`102`	`x86_cpu_loapics[cpuboot->cpu_id], "APIC ID miss match!");`
`103`	`103`	`#endif`