RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-30 21:58:10 +00:00
Code Issues Activity Actions

Kernel: Store IRQControllers in NonnullRefPtrs instead of RefPtrs

Browse source 
These are always non-null, so there's no point in storing them in a
nullable container.
This commit is contained in:
Idan Horowitz 2022-09-25 15:25:14 +03:00
parent 176989d811
commit 9abbeff79f
8 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Kernel/Arch/aarch64/InterruptManagement.cpp
View file

@ -42,12 +42,12 @@ u8 InterruptManagement::acquire_mapped_interrupt_number(u8 interrupt_number)
return interrupt_number; return interrupt_number;
} }
Vector<LockRefPtr<IRQController>> const& InterruptManagement::controllers() Vector<NonnullLockRefPtr<IRQController>> const& InterruptManagement::controllers()
{ {
return m_interrupt_controllers; return m_interrupt_controllers;
} }
LockRefPtr<IRQController> InterruptManagement::get_responsible_irq_controller(u8) NonnullLockRefPtr<IRQController> InterruptManagement::get_responsible_irq_controller(u8)
{ {
// TODO: Support more interrupt controllers // TODO: Support more interrupt controllers
VERIFY(m_interrupt_controllers.size() == 1); VERIFY(m_interrupt_controllers.size() == 1);

6
Kernel/Arch/aarch64/InterruptManagement.h
View file

@ -20,14 +20,14 @@ public:
static u8 acquire_mapped_interrupt_number(u8 original_irq); static u8 acquire_mapped_interrupt_number(u8 original_irq);
Vector<LockRefPtr<IRQController>> const& controllers(); Vector<NonnullLockRefPtr<IRQController>> const& controllers();
LockRefPtr<IRQController> get_responsible_irq_controller(u8 interrupt_vector); NonnullLockRefPtr<IRQController> get_responsible_irq_controller(u8 interrupt_vector);
private: private:
InterruptManagement() = default; InterruptManagement() = default;
void find_controllers(); void find_controllers();
Vector<LockRefPtr<IRQController>> m_interrupt_controllers; Vector<NonnullLockRefPtr<IRQController>> m_interrupt_controllers;
}; };
} }

6
Kernel/Arch/x86/InterruptManagement.h
View file

@ -51,8 +51,8 @@ public:
virtual void switch_to_pic_mode(); virtual void switch_to_pic_mode();
virtual void switch_to_ioapic_mode(); virtual void switch_to_ioapic_mode();
LockRefPtr<IRQController> get_responsible_irq_controller(u8 interrupt_vector); NonnullLockRefPtr<IRQController> get_responsible_irq_controller(u8 interrupt_vector);
LockRefPtr<IRQController> get_responsible_irq_controller(IRQControllerType controller_type, u8 interrupt_vector); NonnullLockRefPtr<IRQController> get_responsible_irq_controller(IRQControllerType controller_type, u8 interrupt_vector);
Vector<ISAInterruptOverrideMetadata> const& isa_overrides() const { return m_isa_interrupt_overrides; } Vector<ISAInterruptOverrideMetadata> const& isa_overrides() const { return m_isa_interrupt_overrides; }
@ -69,7 +69,7 @@ private:
InterruptManagement(); InterruptManagement();
PhysicalAddress search_for_madt(); PhysicalAddress search_for_madt();
void locate_apic_data(); void locate_apic_data();
Vector<LockRefPtr<IRQController>> m_interrupt_controllers; Vector<NonnullLockRefPtr<IRQController>> m_interrupt_controllers;
Vector<ISAInterruptOverrideMetadata> m_isa_interrupt_overrides; Vector<ISAInterruptOverrideMetadata> m_isa_interrupt_overrides;
Vector<PCIInterruptOverrideMetadata> m_pci_interrupt_overrides; Vector<PCIInterruptOverrideMetadata> m_pci_interrupt_overrides;
PhysicalAddress m_madt; PhysicalAddress m_madt;

5
Kernel/Arch/x86/common/InterruptManagement.cpp
View file

@ -65,7 +65,6 @@ void InterruptManagement::enumerate_interrupt_handlers(Function<void(GenericInte
IRQController& InterruptManagement::get_interrupt_controller(int index) IRQController& InterruptManagement::get_interrupt_controller(int index)
{ {
VERIFY(index >= 0); VERIFY(index >= 0);
VERIFY(!m_interrupt_controllers[index].is_null());
return *m_interrupt_controllers[index]; return *m_interrupt_controllers[index];
} }
@ -98,7 +97,7 @@ u8 InterruptManagement::get_irq_vector(u8 mapped_interrupt_vector)
return mapped_interrupt_vector; return mapped_interrupt_vector;
} }
LockRefPtr<IRQController> InterruptManagement::get_responsible_irq_controller(IRQControllerType controller_type, u8 interrupt_vector) NonnullLockRefPtr<IRQController> InterruptManagement::get_responsible_irq_controller(IRQControllerType controller_type, u8 interrupt_vector)
{ {
for (auto& irq_controller : m_interrupt_controllers) { for (auto& irq_controller : m_interrupt_controllers) {
if (irq_controller->gsi_base() <= interrupt_vector && irq_controller->type() == controller_type) if (irq_controller->gsi_base() <= interrupt_vector && irq_controller->type() == controller_type)
@ -107,7 +106,7 @@ LockRefPtr<IRQController> InterruptManagement::get_responsible_irq_controller(IR
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
} }
LockRefPtr<IRQController> InterruptManagement::get_responsible_irq_controller(u8 interrupt_vector) NonnullLockRefPtr<IRQController> InterruptManagement::get_responsible_irq_controller(u8 interrupt_vector)
{ {
if (m_interrupt_controllers.size() == 1 && m_interrupt_controllers[0]->type() == IRQControllerType::i8259) { if (m_interrupt_controllers.size() == 1 && m_interrupt_controllers[0]->type() == IRQControllerType::i8259) {
return m_interrupt_controllers[0]; return m_interrupt_controllers[0];

1
Kernel/Interrupts/IRQHandler.cpp
View file

@ -25,7 +25,6 @@ bool IRQHandler::eoi()
{ {
dbgln_if(IRQ_DEBUG, "EOI IRQ {}", interrupt_number()); dbgln_if(IRQ_DEBUG, "EOI IRQ {}", interrupt_number());
if (!m_shared_with_others) { if (!m_shared_with_others) {
VERIFY(!m_responsible_irq_controller.is_null());
m_responsible_irq_controller->eoi(*this); m_responsible_irq_controller->eoi(*this);
return true; return true;
} }

2
Kernel/Interrupts/IRQHandler.h
View file

@ -40,7 +40,7 @@ protected:
private: private:
bool m_shared_with_others { false }; bool m_shared_with_others { false };
bool m_enabled { false }; bool m_enabled { false };
LockRefPtr<IRQController> m_responsible_irq_controller; NonnullLockRefPtr<IRQController> m_responsible_irq_controller;
}; };
} }

2
Kernel/Interrupts/SharedIRQHandler.h
View file

@ -41,6 +41,6 @@ private:
explicit SharedIRQHandler(u8 interrupt_number); explicit SharedIRQHandler(u8 interrupt_number);
bool m_enabled { true }; bool m_enabled { true };
GenericInterruptHandler::List m_handlers; GenericInterruptHandler::List m_handlers;
LockRefPtr<IRQController> m_responsible_irq_controller; NonnullLockRefPtr<IRQController> m_responsible_irq_controller;
}; };
} }

2
Kernel/Interrupts/SpuriousInterruptHandler.h
View file

@ -42,7 +42,7 @@ private:
explicit SpuriousInterruptHandler(u8 interrupt_number); explicit SpuriousInterruptHandler(u8 interrupt_number);
bool m_enabled { false }; bool m_enabled { false };
bool m_real_irq { false }; bool m_real_irq { false };
LockRefPtr<IRQController> m_responsible_irq_controller; NonnullLockRefPtr<IRQController> m_responsible_irq_controller;
OwnPtr<GenericInterruptHandler> m_real_handler; OwnPtr<GenericInterruptHandler> m_real_handler;
}; };
} }