fix(arch): enable IRQ0 and IRQ1 in UEFI temporarily

Author: criskell

kernel/src/interrupts.rs

@@ -4,9 +4,9 @@ use pic8259::ChainedPics;
 use spin::Mutex;
 use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame, PageFaultErrorCode};
 
-// PIC primário
+/// Primary PIC
 pub const PIC_1_OFFSET: u8 = 32;
-// PIC secundário
+/// Secondary PIC
 pub const PIC_2_OFFSET: u8 = PIC_1_OFFSET + 8;
 
 pub static PICS: Mutex<ChainedPics> =
@@ -34,6 +34,7 @@ lazy_static! {
         let mut idt = InterruptDescriptorTable::new();
         idt.breakpoint.set_handler_fn(breakpoint_handler);
         idt.page_fault.set_handler_fn(page_fault_handler);
+
         unsafe {
             idt.double_fault
                 .set_handler_fn(double_fault_handler)
@@ -43,6 +44,7 @@ lazy_static! {
                 .set_handler_fn(generic_protection_fault_handler)
                 .set_stack_index(gdt::GENERIC_PROTECTION_FAULT_IST_INDEX);
         }
+
         idt[InterruptIndex::Timer.as_usize()].set_handler_fn(timer_interrupt_handler);
         idt[InterruptIndex::Keyboard.as_usize()].set_handler_fn(keyboard_interrupt_handler);
         idt

kernel/src/lib.rs

@@ -53,7 +53,26 @@ pub fn test_panic_handler(info: &PanicInfo) -> ! {
 pub fn init() {
     interrupts::init_idt();
     gdt::init();
-    // unsafe { interrupts::PICS.lock().initialize() };
+    unsafe {
+        interrupts::PICS.lock().initialize();
+
+        // FIXME: Set up APIC.
+        // This is used for enabling timer and keyboard interrupts.
+        // 0xFC = PIC1 and 0xFF = PIC2
+        // Bit 1 means that IRQ is disabled. Bit 0 means that IRQ is enabled.
+        //
+        // PIC1 (Master PIC) IRQs:
+        //  * IRQ0: Timer (PIT)
+        //  * IRQ1: PS/2 Keyboard
+        //  * IRQ2: Cascade to PIC2
+        // PIC2 (Slave) IRQs:
+        //  * IRQ8: Real time clock
+        //  * IRQ9: ACPI
+        //
+        // 0xFC = 1111 1100 (Only IRQ0 and IRQ1 is enabled)
+        // 0xFF = 1111 1111 (All IRQs is disabled)
+        interrupts::PICS.lock().write_masks(0xFC, 0xFF);
+    };
     x86_64::instructions::interrupts::enable();
 }
 

kernel/src/main.rs

@@ -14,7 +14,7 @@ use core::panic::PanicInfo;
 #[cfg(userspace)]
 use kernel::userspace;
 use kernel::{
-    framebuffer, println,
+    framebuffer, hlt_loop, println,
     task::{Task, executor::Executor, keyboard},
 };
 
@@ -77,6 +77,8 @@ fn kernel_main(boot_info: &'static mut BootInfo) -> ! {
     executor.spawn(Task::new(keyboard::print_keypresses()));
     executor.run();
 
+    hlt_loop();
+
     #[cfg(test)]
     test_main();
 }

src/main.rs

@@ -11,7 +11,7 @@ fn main() {
             .arg(format!("format=raw,file={uefi_path}"));
         cmd.arg("-bios").arg(ovmf_prebuilt::ovmf_pure_efi());
         cmd.arg("-monitor").arg("stdio");
-        // cmd.arg("-d").arg("int");
+        cmd.arg("-d").arg("int");
         cmd.arg("-no-reboot");
         cmd.arg("-no-shutdown");
         cmd.arg("-s");