Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-10 05:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable IA32_EFER.NXE earlier in AP

Browse Source
This commit is contained in:
Zhang Junyang 2025-04-04 16:52:25 +08:00 committed by Ruihan Li
parent 9915978d35
commit d378dc51ff
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ostd/src/arch/x86/boot/ap_boot.S
View File

@ -8,15 +8,23 @@
.section ".ap_boot", "awx" .section ".ap_boot", "awx"
.align 4096 .align 4096
IA32_APIC_BASE = 0x1B IA32_APIC_BASE_MSR = 0x1B
IA32_X2APIC_APICID = 0x802 IA32_X2APIC_APICID_MSR = 0x802
MMIO_XAPIC_APICID = 0xFEE00020 IA32_EFER_MSR = 0xC0000080
XAPIC_APICID_MMIO_ADDR = 0xFEE00020
.macro setup_64bit_gdt_and_page_table eax .macro setup_64bit_gdt_and_page_table eax
// Use the 64-bit GDT. // Use the 64-bit GDT.
.extern boot_gdtr .extern boot_gdtr
lgdt [boot_gdtr] lgdt [boot_gdtr]
// Set the NX bit support in the EFER MSR.
mov ecx, IA32_EFER_MSR
rdmsr
or eax, 1 << 11 // support no-execute PTE flag
wrmsr
// Enable PAE and PGE. // Enable PAE and PGE.
mov \eax, cr4 mov \eax, cr4
or \eax, 0xa0 or \eax, 0xa0
@ -25,6 +33,7 @@ MMIO_XAPIC_APICID = 0xFEE00020
// Set the page table. The application processors use // Set the page table. The application processors use
// the same page table as the bootstrap processor's // the same page table as the bootstrap processor's
// boot phase page table. // boot phase page table.
xor \eax, \eax // clear the upper 32 bits if \eax is 64-bit
mov eax, __boot_page_table_pointer // 32-bit load mov eax, __boot_page_table_pointer // 32-bit load
mov cr3, \eax mov cr3, \eax
.endm .endm
@ -106,11 +115,11 @@ ap_protect_entry:
// Tell if it is xAPIC or x2APIC. // Tell if it is xAPIC or x2APIC.
// IA32_APIC_BASE register: // IA32_APIC_BASE register:
// bit 8: BSP—Processor is BSP // - bit 8: BSP—Processor is BSP
// bit 10: EXTD—Enable x2APIC mode // - bit 10: EXTD—Enable x2APIC mode
// bit 11: EN—xAPIC global enable/disable // - bit 11: EN—xAPIC global enable/disable
// bit 12-35: APIC Base—Base physical address // - bit 12-35: APIC Base—Base physical address
mov ecx, IA32_APIC_BASE mov ecx, IA32_APIC_BASE_MSR
rdmsr rdmsr
and eax, 0x400 // check EXTD bit and eax, 0x400 // check EXTD bit
cmp eax, 0x400 cmp eax, 0x400
@ -119,14 +128,14 @@ ap_protect_entry:
xapic_mode: xapic_mode:
// In xAPIC mode, the local APIC ID is stored in // In xAPIC mode, the local APIC ID is stored in
// the MMIO region. // the MMIO region.
mov eax, [MMIO_XAPIC_APICID] mov eax, [XAPIC_APICID_MMIO_ADDR]
shr eax, 24 shr eax, 24
jmp ap_protect jmp ap_protect
x2apic_mode: x2apic_mode:
// In x2APIC mode, the local APIC ID is stored in // In x2APIC mode, the local APIC ID is stored in
// IA32_X2APIC_APICID MSR. // IA32_X2APIC_APICID MSR.
mov ecx, IA32_X2APIC_APICID mov ecx, IA32_X2APIC_APICID_MSR
rdmsr rdmsr
jmp ap_protect jmp ap_protect
@ -148,10 +157,10 @@ ap_protect:
setup_64bit_gdt_and_page_table eax setup_64bit_gdt_and_page_table eax
// Enable long mode. // Enable long mode.
mov ecx, 0xc0000080 mov ecx, IA32_EFER_MSR
rdmsr // load EFER MSR rdmsr
or eax, 1 << 8 or eax, 1 << 8
wrmsr // set long bit wrmsr
// Enable paging. // Enable paging.
mov eax, cr0 mov eax, cr0