RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:37:35 +00:00
Code Issues Activity Actions

Interrupts: Simplify initialization a bit more

Browse source
This commit is contained in:
Liav A 2020-04-09 21:17:02 +03:00 • committed by Andreas Kling
parent 6b38befd91
commit 0fa50b6405
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Kernel/Interrupts/InterruptManagement.cpp
View file

@ -142,13 +142,6 @@ PhysicalAddress InterruptManagement::search_for_madt()
InterruptManagement::InterruptManagement() InterruptManagement::InterruptManagement()
: m_madt(search_for_madt()) : m_madt(search_for_madt())
{ {
if (m_madt.is_null()) {
m_interrupt_controllers[0] = adopt(*new PIC());
return;
}
dbg() << "Interrupts: MADT @ P " << m_madt.as_ptr();
locate_apic_data();
} }
void InterruptManagement::switch_to_pic_mode() void InterruptManagement::switch_to_pic_mode()
@ -156,6 +149,7 @@ void InterruptManagement::switch_to_pic_mode()
klog() << "Interrupts: Switch to Legacy PIC mode"; klog() << "Interrupts: Switch to Legacy PIC mode";
InterruptDisabler disabler; InterruptDisabler disabler;
m_smp_enabled = false; m_smp_enabled = false;
m_interrupt_controllers[0] = adopt(*new PIC());
SpuriousInterruptHandler::initialize(7); SpuriousInterruptHandler::initialize(7);
SpuriousInterruptHandler::initialize(15); SpuriousInterruptHandler::initialize(15);
for (auto& irq_controller : m_interrupt_controllers) { for (auto& irq_controller : m_interrupt_controllers) {
@ -173,6 +167,15 @@ void InterruptManagement::switch_to_ioapic_mode()
{ {
klog() << "Interrupts: Switch to IOAPIC mode"; klog() << "Interrupts: Switch to IOAPIC mode";
InterruptDisabler disabler; InterruptDisabler disabler;
if (m_madt.is_null()) {
dbg() << "Interrupts: ACPI MADT is not available, reverting to PIC mode";
switch_to_pic_mode();
return;
}
dbg() << "Interrupts: MADT @ P " << m_madt.as_ptr();
locate_apic_data();
m_smp_enabled = true; m_smp_enabled = true;
if (m_interrupt_controllers.size() == 1) { if (m_interrupt_controllers.size() == 1) {
if (get_interrupt_controller(0).type() == IRQControllerType::i8259) { if (get_interrupt_controller(0).type() == IRQControllerType::i8259) {