From 68c3f9aa5a69f6d93bf1ec219b9e2f10ecb75fce Mon Sep 17 00:00:00 2001 From: Liav A Date: Sat, 10 Jun 2023 11:10:02 +0300 Subject: [PATCH] Kernel/Interrupts: Move PCIIRQHandler => PCI::IRQHandler This class is part of the PCI code so let's move it to the PCI namespace like other handling code parts of the PCI bus. --- Kernel/Devices/Audio/IntelHDA/InterruptHandler.cpp | 2 +- Kernel/Devices/Audio/IntelHDA/InterruptHandler.h | 6 +++--- Kernel/Devices/Storage/ATA/AHCI/InterruptHandler.cpp | 2 +- Kernel/Devices/Storage/ATA/AHCI/InterruptHandler.h | 2 +- Kernel/Devices/Storage/NVMe/NVMeInterruptQueue.cpp | 2 +- Kernel/Devices/Storage/NVMe/NVMeInterruptQueue.h | 2 +- Kernel/Interrupts/PCIIRQHandler.cpp | 12 ++++++------ Kernel/Interrupts/PCIIRQHandler.h | 8 ++++---- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Kernel/Devices/Audio/IntelHDA/InterruptHandler.cpp b/Kernel/Devices/Audio/IntelHDA/InterruptHandler.cpp index 62777bcf28..59cf9d527c 100644 --- a/Kernel/Devices/Audio/IntelHDA/InterruptHandler.cpp +++ b/Kernel/Devices/Audio/IntelHDA/InterruptHandler.cpp @@ -10,7 +10,7 @@ namespace Kernel::Audio::IntelHDA { InterruptHandler::InterruptHandler(Controller& controller) - : PCIIRQHandler(controller, controller.device_identifier().interrupt_line().value()) + : PCI::IRQHandler(controller, controller.device_identifier().interrupt_line().value()) , m_controller(controller) { enable_irq(); diff --git a/Kernel/Devices/Audio/IntelHDA/InterruptHandler.h b/Kernel/Devices/Audio/IntelHDA/InterruptHandler.h index 84d961c75d..43f8e10824 100644 --- a/Kernel/Devices/Audio/IntelHDA/InterruptHandler.h +++ b/Kernel/Devices/Audio/IntelHDA/InterruptHandler.h @@ -14,7 +14,7 @@ namespace Kernel::Audio::IntelHDA { class Controller; class InterruptHandler - : public PCIIRQHandler + : public PCI::IRQHandler , public RefCounted { public: static ErrorOr> create(Controller& controller) @@ -22,13 +22,13 @@ public: return adopt_nonnull_ref_or_enomem(new (nothrow) InterruptHandler(controller)); } - // ^PCIIRQHandler + // ^PCI::IRQHandler virtual StringView purpose() const override { return "IntelHDA IRQ Handler"sv; } private: InterruptHandler(Controller& controller); - // ^PCIIRQHandler + // ^PCI::IRQHandler virtual bool handle_irq(RegisterState const&) override; Controller& m_controller; diff --git a/Kernel/Devices/Storage/ATA/AHCI/InterruptHandler.cpp b/Kernel/Devices/Storage/ATA/AHCI/InterruptHandler.cpp index fa67241a85..f0fcfefbb9 100644 --- a/Kernel/Devices/Storage/ATA/AHCI/InterruptHandler.cpp +++ b/Kernel/Devices/Storage/ATA/AHCI/InterruptHandler.cpp @@ -23,7 +23,7 @@ void AHCIInterruptHandler::allocate_resources_and_initialize_ports() } UNMAP_AFTER_INIT AHCIInterruptHandler::AHCIInterruptHandler(AHCIController& controller, u8 irq, AHCI::MaskedBitField taken_ports) - : PCIIRQHandler(controller, irq) + : PCI::IRQHandler(controller, irq) , m_parent_controller(controller) , m_taken_ports(taken_ports) , m_pending_ports_interrupts(create_pending_ports_interrupts_bitfield()) diff --git a/Kernel/Devices/Storage/ATA/AHCI/InterruptHandler.h b/Kernel/Devices/Storage/ATA/AHCI/InterruptHandler.h index 4514a6bbbd..459f5d827b 100644 --- a/Kernel/Devices/Storage/ATA/AHCI/InterruptHandler.h +++ b/Kernel/Devices/Storage/ATA/AHCI/InterruptHandler.h @@ -25,7 +25,7 @@ class AsyncBlockDeviceRequest; class AHCIController; class AHCIPort; -class AHCIInterruptHandler final : public PCIIRQHandler { +class AHCIInterruptHandler final : public PCI::IRQHandler { friend class AHCIController; public: diff --git a/Kernel/Devices/Storage/NVMe/NVMeInterruptQueue.cpp b/Kernel/Devices/Storage/NVMe/NVMeInterruptQueue.cpp index a6f3870d13..b669c6a918 100644 --- a/Kernel/Devices/Storage/NVMe/NVMeInterruptQueue.cpp +++ b/Kernel/Devices/Storage/NVMe/NVMeInterruptQueue.cpp @@ -20,7 +20,7 @@ ErrorOr> NVMeInterruptQueue::try_create(PC UNMAP_AFTER_INIT NVMeInterruptQueue::NVMeInterruptQueue(PCI::Device& device, NonnullOwnPtr rw_dma_region, NonnullRefPtr rw_dma_page, u16 qid, u8 irq, u32 q_depth, OwnPtr cq_dma_region, OwnPtr sq_dma_region, Doorbell db_regs) : NVMeQueue(move(rw_dma_region), rw_dma_page, qid, q_depth, move(cq_dma_region), move(sq_dma_region), move(db_regs)) - , PCIIRQHandler(device, irq) + , PCI::IRQHandler(device, irq) { } diff --git a/Kernel/Devices/Storage/NVMe/NVMeInterruptQueue.h b/Kernel/Devices/Storage/NVMe/NVMeInterruptQueue.h index fbc1c66671..f827927131 100644 --- a/Kernel/Devices/Storage/NVMe/NVMeInterruptQueue.h +++ b/Kernel/Devices/Storage/NVMe/NVMeInterruptQueue.h @@ -12,7 +12,7 @@ namespace Kernel { class NVMeInterruptQueue : public NVMeQueue - , public PCIIRQHandler { + , public PCI::IRQHandler { public: static ErrorOr> try_create(PCI::Device& device, NonnullOwnPtr rw_dma_region, NonnullRefPtr rw_dma_page, u16 qid, u8 irq, u32 q_depth, OwnPtr cq_dma_region, OwnPtr sq_dma_region, Doorbell db_regs); void submit_sqe(NVMeSubmission& submission) override; diff --git a/Kernel/Interrupts/PCIIRQHandler.cpp b/Kernel/Interrupts/PCIIRQHandler.cpp index d70caae5a7..8b3b796969 100644 --- a/Kernel/Interrupts/PCIIRQHandler.cpp +++ b/Kernel/Interrupts/PCIIRQHandler.cpp @@ -9,9 +9,9 @@ #include #include -namespace Kernel { +namespace Kernel::PCI { -PCIIRQHandler::PCIIRQHandler(PCI::Device& device, u8 irq) +IRQHandler::IRQHandler(PCI::Device& device, u8 irq) : GenericInterruptHandler(irq) , device(device) { @@ -24,7 +24,7 @@ PCIIRQHandler::PCIIRQHandler(PCI::Device& device, u8 irq) disable_irq(); } -bool PCIIRQHandler::eoi() +bool IRQHandler::eoi() { dbgln_if(IRQ_DEBUG, "EOI IRQ {}", interrupt_number()); if (m_shared_with_others) @@ -36,7 +36,7 @@ bool PCIIRQHandler::eoi() return true; } -void PCIIRQHandler::enable_irq() +void IRQHandler::enable_irq() { dbgln_if(IRQ_DEBUG, "Enable IRQ {}", interrupt_number()); if (!is_registered()) @@ -50,7 +50,7 @@ void PCIIRQHandler::enable_irq() device.enable_interrupt(interrupt_number()); } -void PCIIRQHandler::disable_irq() +void IRQHandler::disable_irq() { dbgln_if(IRQ_DEBUG, "Disable IRQ {}", interrupt_number()); m_enabled = false; @@ -63,7 +63,7 @@ void PCIIRQHandler::disable_irq() device.disable_interrupt(interrupt_number()); } -bool PCIIRQHandler::handle_interrupt(RegisterState const& regs) +bool IRQHandler::handle_interrupt(RegisterState const& regs) { return handle_irq(regs); } diff --git a/Kernel/Interrupts/PCIIRQHandler.h b/Kernel/Interrupts/PCIIRQHandler.h index a06138f12d..96dcd6d4f0 100644 --- a/Kernel/Interrupts/PCIIRQHandler.h +++ b/Kernel/Interrupts/PCIIRQHandler.h @@ -12,11 +12,11 @@ #include #include -namespace Kernel { +namespace Kernel::PCI { -class PCIIRQHandler : public GenericInterruptHandler { +class IRQHandler : public GenericInterruptHandler { public: - virtual ~PCIIRQHandler() = default; + virtual ~IRQHandler() = default; virtual bool handle_interrupt(RegisterState const& regs) override; virtual bool handle_irq(RegisterState const&) = 0; @@ -35,7 +35,7 @@ public: void set_shared_with_others(bool status) { m_shared_with_others = status; } protected: - PCIIRQHandler(PCI::Device& device, u8 irq); + IRQHandler(PCI::Device& device, u8 irq); private: bool m_shared_with_others { false };