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

Interrupts: Handle spurious IRQs from eoi() method

Browse source
This commit is contained in:
Liav A 2020-03-21 12:03:22 +02:00 • committed by Andreas Kling
parent 8d9b6c57b5
commit 5f579904c1
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Kernel/Interrupts/PIC.cpp
View file

@ -137,8 +137,13 @@ void PIC::eoi(const GenericInterruptHandler& handler) const
{ {
InterruptDisabler disabler; InterruptDisabler disabler;
ASSERT(!is_hard_disabled()); ASSERT(!is_hard_disabled());
ASSERT(handler.interrupt_number() >= gsi_base() && handler.interrupt_number() < interrupt_vectors_count()); u8 irq = handler.interrupt_number();
eoi_interrupt(handler.interrupt_number()); ASSERT(irq >= gsi_base() && irq < interrupt_vectors_count());
if ((1 << irq) & m_cached_irq_mask) {
spurious_eoi(handler);
return;
}
eoi_interrupt(irq);
} }
void PIC::eoi_interrupt(u8 irq) const void PIC::eoi_interrupt(u8 irq) const

2
Kernel/Interrupts/SpuriousInterruptHandler.cpp
View file

@ -44,7 +44,7 @@ void SpuriousInterruptHandler::unregister_handler(GenericInterruptHandler&)
bool SpuriousInterruptHandler::eoi() bool SpuriousInterruptHandler::eoi()
{ {
// FIXME: Actually check if IRQ7 or IRQ15 are spurious, and if not, call EOI with the correct interrupt number. // FIXME: Actually check if IRQ7 or IRQ15 are spurious, and if not, call EOI with the correct interrupt number.
m_responsible_irq_controller->spurious_eoi(*this); m_responsible_irq_controller->eoi(*this);
return false; return false;
} }