x86/boot: read APIC base from register

Some CPUs don't use default APIC base. Address in MSR is always valid, and it is already read to test for x2APIC. Signed-off-by: Krystian Hebel <[email protected]>
3mdeb · Apr 26, 2024 · bf433b3 · bf433b3
1 parent 04811d7
commit bf433b3
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/xen/arch/x86/boot/trampoline.S b/xen/arch/x86/boot/trampoline.S
@@ -88,11 +88,12 @@ trampoline_protmode_entry:
          */
         mov     $MSR_APIC_BASE, %ecx
         rdmsr
-        and     $APIC_BASE_EXTD, %eax
+        test    $APIC_BASE_EXTD, %eax
         jnz     .Lx2apic
 
         /* Not x2APIC, read from MMIO */
-        mov     $(APIC_DEFAULT_PHYS_BASE + APIC_ID), %esp
+        and     $APIC_BASE_ADDR_MASK, %eax
+        mov     APIC_ID(%eax), %esp
         shr     $24, %esp
         jmp     1f