justin/jsix_import
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Enable AHCI interrupts.

Browse Source 
* Implement MSI style interrupts
* Move interrupt handling to device_manager for IRQs
* Give device_manager the ability to allocate IRQs
* Move achi::port to an interrupt-based scheme
This commit is contained in:
Justin C. Miller
2018-05-12 18:27:13 -07:00
parent c9277e4b12
commit 289104cde0
12 changed files with 267 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/kernel/device_manager.cpp
View File

@@ -6,14 +6,17 @@
#include "acpi_tables.h"
#include "ahci/driver.h"
#include "apic.h"
#include "console.h"
#include "device_manager.h"
#include "interrupts.h"
#include "log.h"
#include "memory.h"
#include "page_manager.h"
static const char expected_signature[] = "RSD PTR ";
device_manager device_manager::s_instance(nullptr);
ahci_driver ahcid;
struct acpi1_rsdp
@@ -56,6 +59,21 @@ acpi_table_header::validate(uint32_t expected_type) const
}
void irq2_callback(void *)
{
console *cons = console::get();
cons->set_color(11);
cons->puts(".");
cons->set_color();
}
void irq4_callback(void *)
{
// TODO: move this to a real serial driver
console *cons = console::get();
cons->echo();
}
device_manager::device_manager(const void *root_table) :
m_lapic(nullptr)
@@ -81,6 +99,11 @@ device_manager::device_manager(const void *root_table) :
kassert(sum == 0, "ACPI 2.0 RSDP checksum mismatch.");
load_xsdt(reinterpret_cast<const acpi_xsdt *>(acpi2->xsdt_address));
m_irqs.ensure_capacity(32);
m_irqs.set_size(16);
m_irqs[2] = {"Clock interrupt", irq2_callback, nullptr};
m_irqs[4] = {"Serial interrupt", irq4_callback, nullptr};
}
ioapic *
@@ -281,3 +304,19 @@ device_manager::init_drivers()
ahcid.register_device(&device);
}
}
bool
device_manager::allocate_msi(const char *name, pci_device &device, irq_callback cb, void *data)
{
// TODO: find gaps to fill
uint8_t irq = m_irqs.count();
isr vector = isr::irq00 + irq;
m_irqs.append({name, cb, data});
log::debug(logs::device, "Allocating IRQ %02x to %s.", irq, name);
device.write_msi_regs(
0xFEE00000,
static_cast<uint16_t>(vector));
return true;
}