diff options
| author | Andreas Kling <kling@serenityos.org> | 2020-05-23 15:46:28 +0200 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2020-05-23 15:46:56 +0200 |
| commit | a04c8d7101b5e407501f8f15c46ad5b7ed3c4334 (patch) | |
| tree | 22698c8e024ca04fb92fa0873bd5d77f38332139 /Kernel/Interrupts/InterruptManagement.cpp | |
| parent | c21dc21f36798e2e941e5f2f0da7531c1a228bea (diff) | |
| download | serenity-a04c8d7101b5e407501f8f15c46ad5b7ed3c4334.zip | |
Kernel: Use TypedMappings when looking for APIC information
Diffstat (limited to 'Kernel/Interrupts/InterruptManagement.cpp')
| -rw-r--r-- | Kernel/Interrupts/InterruptManagement.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Kernel/Interrupts/InterruptManagement.cpp b/Kernel/Interrupts/InterruptManagement.cpp index 009e229ea4..5eaacdfdec 100644 --- a/Kernel/Interrupts/InterruptManagement.cpp +++ b/Kernel/Interrupts/InterruptManagement.cpp @@ -29,6 +29,7 @@ #include <Kernel/ACPI/MultiProcessorParser.h> #include <Kernel/Arch/i386/CPU.h> #include <Kernel/CommandLine.h> +#include <Kernel/IO.h> #include <Kernel/Interrupts/APIC.h> #include <Kernel/Interrupts/IOAPIC.h> #include <Kernel/Interrupts/InterruptManagement.h> @@ -37,7 +38,7 @@ #include <Kernel/Interrupts/UnhandledInterruptHandler.h> #include <Kernel/Syscall.h> #include <Kernel/VM/MemoryManager.h> -#include <Kernel/IO.h> +#include <Kernel/VM/TypedMapping.h> #define PCAT_COMPAT_FLAG 0x1 @@ -198,22 +199,21 @@ void InterruptManagement::switch_to_ioapic_mode() void InterruptManagement::locate_apic_data() { ASSERT(!m_madt.is_null()); - auto region = MM.allocate_kernel_region(m_madt.page_base(), (PAGE_SIZE * 2), "Initializing Interrupts", Region::Access::Read); - auto& madt = *(const ACPI::Structures::MADT*)region->vaddr().offset(m_madt.offset_in_page()).as_ptr(); + auto madt = map_typed<ACPI::Structures::MADT>(m_madt); int irq_controller_count = 0; - if (madt.flags & PCAT_COMPAT_FLAG) { + if (madt->flags & PCAT_COMPAT_FLAG) { m_interrupt_controllers[0] = adopt(*new PIC()); irq_controller_count++; } size_t entry_index = 0; - size_t entries_length = madt.h.length - sizeof(ACPI::Structures::MADT); - auto* madt_entry = madt.entries; + size_t entries_length = madt->h.length - sizeof(ACPI::Structures::MADT); + auto* madt_entry = madt->entries; while (entries_length > 0) { size_t entry_length = madt_entry->length; if (madt_entry->type == (u8)ACPI::Structures::MADTEntryType::IOAPIC) { auto* ioapic_entry = (const ACPI::Structures::MADTEntries::IOAPIC*)madt_entry; - dbg() << "IOAPIC found @ MADT entry " << entry_index << ", MMIO Registers @ Px" << String::format("%x", ioapic_entry->ioapic_address); + dbg() << "IOAPIC found @ MADT entry " << entry_index << ", MMIO Registers @ " << PhysicalAddress(ioapic_entry->ioapic_address); m_interrupt_controllers.resize(1 + irq_controller_count); // FIXME: Casting ioapic_entry->ioapic_address below looks suspicious! m_interrupt_controllers[irq_controller_count] = adopt(*new IOAPIC(*(ioapic_mmio_regs*)(FlatPtr)ioapic_entry->ioapic_address, ioapic_entry->gsi_base)); |