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

Support x2APIC

Browse Source
This commit is contained in:
Yuke Peng
2023-06-27 04:56:16 -07:00
committed by Tate, Hongliang Tian
parent 0e8b2aff7b
commit 893b174dc9
12 changed files with 308 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
framework/jinux-frame/src/arch/x86/mod.rs
View File

@ -9,6 +9,7 @@ pub(crate) mod timer;
use alloc::fmt;
use core::fmt::Write;
use kernel::apic::ioapic;
use log::info;
pub(crate) fn before_all_init() {
@ -21,12 +22,14 @@ pub(crate) fn after_all_init() {
irq::init();
device::serial::callback_init();
kernel::acpi::init();
if kernel::xapic::has_apic() {
kernel::ioapic::init();
kernel::xapic::init();
} else {
info!("No apic exists, using pic instead");
kernel::pic::enable();
match kernel::apic::init() {
Ok(_) => {
ioapic::init();
}
Err(err) => {
info!("APIC init error:{:?}", err);
kernel::pic::enable();
}
}
timer::init();
// Some driver like serial may use PIC
@ -35,7 +38,9 @@ pub(crate) fn after_all_init() {
pub(crate) fn interrupts_ack() {
kernel::pic::ack();
kernel::xapic::ack();
if let Some(apic) = kernel::apic::APIC_INSTANCE.get() {
apic.lock().eoi();
}
}
struct Stdout;