FIXED THE APIC HELL YEAH

kernel/src/arch/x86_64/cpu/apic.rs

@@ -1,7 +1,7 @@
 use core::arch::x86_64::__cpuid;
 
 use crate::arch::x86_64::memory::mapping::PHYSICAL_MEMORY_OFFSET;
-use crate::serial_print;
+use crate::{serial_print, serial_println};
 use x86_64::{
     PhysAddr, VirtAddr,
     structures::paging::{Mapper, Page, PageTableFlags, PhysFrame, Size4KiB},
@@ -40,19 +40,21 @@ fn get_apic_base() -> PhysAddr {
     PhysAddr::new(value & 0xfffff0000)
 }
 
-fn write_apic_register(apic_base: &VirtAddr, reg: u8, value: u32) {
+fn write_apic_register(apic_base: &PhysAddr, reg: u8, value: u32) {
     let apic_base = apic_base.as_u64();
     let reg_addr = (apic_base & 0xFFFFF0000) + reg as u64;
-    unsafe { *(reg_addr as *mut u32) = value };
+    let virt_addr = unsafe { phys_to_virt(PhysAddr::new(reg_addr)) };
+    unsafe { *(virt_addr.as_u64() as *mut u32) = value };
 }
 
-fn read_apic_register(apic_base: &VirtAddr, reg: u8) -> u32 {
+fn read_apic_register(apic_base: &PhysAddr, reg: u8) -> u32 {
     let apic_base = apic_base.as_u64();
-
-    serial_print!("got apic base");
-
     let reg_addr = (apic_base & 0xFFFFF0000) + reg as u64;
-    unsafe { *(reg_addr as *const u32) }
+
+    serial_println!("reading: {:?}", VirtAddr::new(reg_addr));
+
+    let virt_addr = unsafe { phys_to_virt(PhysAddr::new(reg_addr)) };
+    unsafe { *(virt_addr.as_u64() as *const u32) }
 }
 
 pub fn check_apic() -> bool {
@@ -74,27 +76,15 @@ pub fn enable_apic() {
     let apic_phys_addr = get_apic_base();
     set_apic_base_enable(apic_phys_addr);
     // map virt address of apic
-
     let apic_virt = unsafe { phys_to_virt(apic_phys_addr) };
-    let page: Page<Size4KiB> = Page::containing_address(apic_virt);
-    let frame: PhysFrame<Size4KiB> = PhysFrame::containing_address(apic_phys_addr);
-    let flags: PageTableFlags = PageTableFlags::PRESENT | PageTableFlags::WRITABLE;
 
-    unsafe {
-        match mapper.map_to(page, frame, flags, &mut *frame_allocator) {
-            Ok(_) => {}
-            Err(why) => panic!("failed to map apic: {:?}", why),
-        }
-    }
+    serial_println!("Trying to map: {:?} -> {:?}", apic_virt, apic_phys_addr);
 
-    // // FIXME: this causes a page fault
-    // // TODO: map to virtual memory
+    // FIXME: this causes a page fault
+    // TODO: map to virtual memory
 
-    let reg = read_apic_register(&apic_virt, 0xF0);
-
-    serial_print!("ok2");
-
-    write_apic_register(&apic_virt, 0xF0, reg | 0x100);
+    let reg = read_apic_register(&apic_phys_addr, 0xF0);
+    write_apic_register(&apic_phys_addr, 0xF0, reg | 0x100);
 }
 
 pub struct Apic {}

kernel/src/lib.rs

@@ -22,6 +22,7 @@ use core::arch::asm;
 use limine::BaseRevision;
 use x86_64::VirtAddr;
 use arch::x86_64::memory::allocation::page_alloc::FoundryOSFrameAllocator;
+use crate::arch::x86_64::cpu::apic::enable_apic;
 
 pub mod arch;
 pub mod resources;
@@ -99,17 +100,17 @@ pub fn boot() -> Result<(), &'static str> {
     }
     println_log!("[Success]");
 
-    print_log!("    Enabling PICs... ");
-    interrupts::enable_pic();
-    println_log!("[Success]");
+    // print_log!("    Enabling PICs... ");
+    // interrupts::enable_pic();
+    // println_log!("[Success]");
 
     // print_log!("    Disabling PICs... ");
     // interrupts::disable_pic();
     // println_log!("[Success]");
 
-    // print_log!("    Initialising APIC");
-    // enable_apic();
-    // println_log!("[Success]");
+    print_log!("    Initialising APIC... ");
+    enable_apic();
+    println_log!("[Success]");
 
     print_log!("    Enabling Interrupts... ");
     x86_64::instructions::interrupts::enable();