drew/acadia
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

[Zion][Denali] Move to MSI for AHCI devices.

Browse source 
This will allow us to properly do interrupts for XHCI devices in the
future.

Also move PCI device header parsing to a shared library.

Get rid of the old irq register format which supplied an irq number and
instead pass the appropriate irq number back out to the caller.
This commit is contained in:
Drew Galbraith 2025-05-05 23:13:59 -07:00
parent c645405ca8
commit f26fd73116
21 changed files with 371 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

48
zion/interrupt/interrupt.cpp
View file

@ -109,7 +109,7 @@ extern "C" void interrupt_protection_fault(InterruptFrame* frame) {
} else {
dbgln("GDT");
}
dbgln("Index: {}", err >> 3);
dbgln("Index: {} ({x})", err >> 3, err >> 3);
dbgln("RIP: {x}", frame->rip);
dbgln("RAX: {x}, RBX: {x}, RCX: {x}, RDX: {x}", frame->rax, frame->rbx,
frame->rcx, frame->rdx);
@ -197,40 +197,27 @@ extern "C" void interrupt_apic_timer(InterruptFrame*) {
gScheduler->Preempt();
}
extern "C" void isr_keyboard();
extern "C" void interrupt_keyboard(InterruptFrame*) {
glcr::Array<uint8_t> data(1);
data[0] = inb(0x60);
IpcMessage msg{.data = glcr::Move(data)};
DriverManager::Get().WriteMessage(kZIrqKbd, glcr::Move(msg));
extern "C" void isr_60();
extern "C" void interrupt_60(InterruptFrame*) {
DriverManager::Get().WriteMessage(0x60, {});
gApic->SignalEOI();
}
extern "C" void isr_pci1();
extern "C" void interrupt_pci1(InterruptFrame*) {
DriverManager::Get().WriteMessage(kZIrqPci1, {});
extern "C" void isr_61();
extern "C" void interrupt_61(InterruptFrame*) {
DriverManager::Get().WriteMessage(0x61, {});
gApic->SignalEOI();
}
extern "C" void isr_pci2();
extern "C" void interrupt_pci2(InterruptFrame*) {
DriverManager::Get().WriteMessage(kZIrqPci2, {});
dbgln("Interrupt PCI line 2");
extern "C" void isr_62();
extern "C" void interrupt_62(InterruptFrame*) {
DriverManager::Get().WriteMessage(0x62, {});
gApic->SignalEOI();
}
extern "C" void isr_pci3();
extern "C" void interrupt_pci3(InterruptFrame*) {
DriverManager::Get().WriteMessage(kZIrqPci3, {});
dbgln("Interrupt PCI line 3");
gApic->SignalEOI();
}
extern "C" void isr_pci4();
extern "C" void interrupt_pci4(InterruptFrame*) {
DriverManager::Get().WriteMessage(kZIrqPci4, {});
dbgln("Interrupt PCI line 4");
extern "C" void isr_63();
extern "C" void interrupt_63(InterruptFrame*) {
DriverManager::Get().WriteMessage(0x63, {});
gApic->SignalEOI();
}
@ -243,12 +230,11 @@ void InitIdt() {
gIdt[0x20] = CreateDescriptor(isr_timer);
gIdt[0x21] = CreateDescriptor(isr_apic_timer);
gIdt[0x22] = CreateDescriptor(isr_keyboard);
gIdt[0x30] = CreateDescriptor(isr_pci1);
gIdt[0x31] = CreateDescriptor(isr_pci2);
gIdt[0x32] = CreateDescriptor(isr_pci3);
gIdt[0x33] = CreateDescriptor(isr_pci4);
gIdt[0x60] = CreateDescriptor(isr_60);
gIdt[0x61] = CreateDescriptor(isr_61);
gIdt[0x62] = CreateDescriptor(isr_62);
gIdt[0x63] = CreateDescriptor(isr_63);
InterruptDescriptorTablePointer idtp{
.size = sizeof(gIdt),