lai: initial intigration

Signed-off-by: Andy-Python-Programmer <[email protected]>

Author: Andy-Python-Programmer

src/Cargo.lock

@@ -33,8 +33,8 @@ hashbrown = "0.11.2"
 rustc-demangle = "0.1.20"
 stivale-boot = "0.2.6"
 intrusive-collections = "0.9.2"
-aml = "0.15.0"
 serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
+lai = { path = "../../../lai" }
 
 [dependencies.vte]
 git = "https://github.com/Andy-Python-Programmer/vte"

src/aero_kernel/Cargo.toml

@@ -26,7 +26,7 @@ use super::sdt::Sdt;
 pub const SIGNATURE: &str = "FACP";
 
 #[repr(C, packed)]
-pub(super) struct Fadt {
+pub struct Fadt {
     pub header: Sdt,
     pub firmware_ctrl: u32,
     pub dsdt: u32,

src/aero_kernel/src/acpi/fadt.rs

@@ -22,12 +22,12 @@
 //!
 //! **Notes**: <https://wiki.osdev.org/ACPI>
 
-use aml::AmlContext;
 use spin::Once;
 
-use crate::mem::paging::{PhysAddr, VirtAddr};
-
-use crate::utils::sync::{Mutex, MutexGuard};
+use crate::{
+    mem::paging::{PhysAddr, VirtAddr},
+    utils::sync::{Mutex, MutexGuard},
+};
 
 use self::{hpet::Hpet, madt::Madt, mcfg::Mcfg, sdt::Sdt};
 
@@ -38,8 +38,6 @@ pub mod mcfg;
 pub mod rsdp;
 pub mod sdt;
 
-static AML_CONTEXT: Once<Mutex<AmlContext>> = Once::new();
-
 enum AcpiHeader {
     Rsdt(&'static rsdp::Rsdt<u32>),
     Xsdt(&'static rsdp::Rsdt<u64>),
@@ -73,12 +71,19 @@ impl AcpiTable {
     }
 
     /// Lookup ACPI table entry with the provided signature.
-    fn lookup_entry(&self, signature: &str) -> Option<&'static Sdt> {
+    pub fn lookup_entry(&self, signature: &str) -> Option<&'static Sdt> {
         match self.header {
             AcpiHeader::Rsdt(rsdt) => rsdt.lookup_entry(signature),
             AcpiHeader::Xsdt(xsdt) => xsdt.lookup_entry(signature),
         }
     }
+
+    pub fn revision(&self) -> u8 {
+        match self.header {
+            AcpiHeader::Rsdt(rsdt) => rsdt.header.revision,
+            AcpiHeader::Xsdt(xsdt) => xsdt.header.revision,
+        }
+    }
 }
 
 #[repr(packed)]
@@ -91,140 +96,21 @@ pub struct GenericAddressStructure {
     pub address: u64,
 }
 
-struct AmlHandler;
-
-impl aml::Handler for AmlHandler {
-    fn read_u8(&self, address: usize) -> u8 {
-        log::trace!("AML: Reading byte from {:#x}", address);
-
-        unsafe {
-            PhysAddr::new(address as u64)
-                .as_hhdm_virt()
-                .as_ptr::<u8>()
-                .read_volatile()
-        }
-    }
-
-    fn read_u16(&self, _address: usize) -> u16 {
-        todo!()
-    }
-
-    fn read_u32(&self, _address: usize) -> u32 {
-        todo!()
-    }
-
-    fn read_u64(&self, _address: usize) -> u64 {
-        todo!()
-    }
-
-    fn write_u8(&mut self, _address: usize, _value: u8) {
-        todo!()
-    }
-
-    fn write_u16(&mut self, _address: usize, _value: u16) {
-        todo!()
-    }
-
-    fn write_u32(&mut self, _address: usize, _value: u32) {
-        todo!()
-    }
-
-    fn write_u64(&mut self, _address: usize, _value: u64) {
-        todo!()
-    }
-
-    fn read_io_u8(&self, _port: u16) -> u8 {
-        todo!()
-    }
-
-    fn read_io_u16(&self, _port: u16) -> u16 {
-        todo!()
-    }
-
-    fn read_io_u32(&self, _port: u16) -> u32 {
-        todo!()
-    }
+static ACPI_TABLE: Once<Mutex<AcpiTable>> = Once::new();
 
-    fn write_io_u8(&self, _port: u16, _value: u8) {
-        todo!()
-    }
-
-    fn write_io_u16(&self, _port: u16, _value: u16) {
-        todo!()
-    }
-
-    fn write_io_u32(&self, _port: u16, _value: u32) {
-        todo!()
-    }
-
-    fn read_pci_u8(&self, _segment: u16, _bus: u8, _device: u8, _unction: u8, _offset: u16) -> u8 {
-        todo!()
-    }
-
-    fn read_pci_u16(
-        &self,
-        _segment: u16,
-        _bus: u8,
-        _device: u8,
-        _function: u8,
-        _offset: u16,
-    ) -> u16 {
-        todo!()
-    }
-
-    fn read_pci_u32(
-        &self,
-        _segment: u16,
-        _bus: u8,
-        _device: u8,
-        _function: u8,
-        _offset: u16,
-    ) -> u32 {
-        todo!()
-    }
-
-    fn write_pci_u8(
-        &self,
-        _segment: u16,
-        _bus: u8,
-        _device: u8,
-        _function: u8,
-        _offset: u16,
-        _value: u8,
-    ) {
-        todo!()
-    }
-
-    fn write_pci_u16(
-        &self,
-        _segment: u16,
-        _bus: u8,
-        _device: u8,
-        _function: u8,
-        _offset: u16,
-        _value: u16,
-    ) {
-        todo!()
-    }
-
-    fn write_pci_u32(
-        &self,
-        _segment: u16,
-        _bus: u8,
-        _device: u8,
-        _function: u8,
-        _offset: u16,
-        _value: u32,
-    ) {
-        todo!()
-    }
+pub fn get_acpi_table() -> MutexGuard<'static, AcpiTable> {
+    ACPI_TABLE.get().unwrap().lock()
 }
 
 /// Initialize the ACPI tables.
-pub fn init(rsdp_address: PhysAddr) -> Result<(), aml::AmlError> {
+pub fn init(rsdp_address: PhysAddr) {
     let rsdp_address = rsdp_address.as_hhdm_virt();
     let acpi_table = AcpiTable::new(rsdp_address);
 
+    ACPI_TABLE.call_once(|| Mutex::new(acpi_table));
+
+    let acpi_table = get_acpi_table();
+
     macro init_table($sig:path => $ty:ty) {
         if let Some(table) = acpi_table.lookup_entry($sig) {
             <$ty>::new(table);
@@ -233,7 +119,7 @@ pub fn init(rsdp_address: PhysAddr) -> Result<(), aml::AmlError> {
 
     if let Some(header) = acpi_table.lookup_entry(mcfg::SIGNATURE) {
         unsafe {
-            let mcfg: &'static Mcfg = header.as_ptr();
+            let mcfg: &'static Mcfg = header.as_ref();
             mcfg.init();
         }
     }
@@ -247,44 +133,11 @@ pub fn init(rsdp_address: PhysAddr) -> Result<(), aml::AmlError> {
                     header.data_len()
                 );
             } else {
-                let madt: &'static Madt = header.as_ptr();
+                let madt: &'static Madt = header.as_ref();
                 madt.init();
             }
         }
     }
 
     init_table!(hpet::SIGNATURE => Hpet);
-
-    let aml_context = AmlContext::new(box AmlHandler, aml::DebugVerbosity::None);
-
-    if let Some(fadt) = acpi_table.lookup_entry(fadt::SIGNATURE) {
-        let fadt: &'static fadt::Fadt = unsafe { fadt.as_ptr() };
-
-        // The DSDT table is put inside the FADT table, instead of listing it in another ACPI table. So
-        // we need to extract the DSDT table from the FADT table.
-        let _dsdt_stream = unsafe {
-            let addr = PhysAddr::new(fadt.dsdt as u64).as_hhdm_virt();
-            let sdt = Sdt::from_address(addr);
-
-            core::slice::from_raw_parts(sdt.data_address() as *mut u8, sdt.data_len())
-        };
-
-        // aml_context.parse_table(dsdt_stream)?;
-    }
-
-    // let pci_router =
-    //     PciRoutingTable::from_prt_path(&AmlName::from_str("\\_SB.PCI0._PRT")?, &mut aml_context)?;
-
-    // drivers::pci::init_pci_router(pci_router);
-
-    AML_CONTEXT.call_once(move || Mutex::new(aml_context));
-    Ok(())
-}
-
-/// Returns an immutable reference to the AML context.
-pub fn get_aml_context() -> MutexGuard<'static, AmlContext> {
-    AML_CONTEXT
-        .get()
-        .expect("attempted to get AML context before the ACPI initialization")
-        .lock()
 }

src/aero_kernel/src/acpi/mod.rs

@@ -22,7 +22,7 @@ use core::mem;
 use crate::mem::paging::VirtAddr;
 
 #[repr(C, packed)]
-pub(super) struct Sdt {
+pub struct Sdt {
     pub(super) signature: [u8; 4],
     pub(super) length: u32,
     pub(super) revision: u8,
@@ -73,7 +73,7 @@ impl Sdt {
     }
 
     #[inline]
-    pub(super) unsafe fn as_ptr<T>(&self) -> &'static T {
+    pub unsafe fn as_ref<T>(&self) -> &'static T {
         &*(self as *const _ as *const T)
     }
 }

src/aero_kernel/src/acpi/sdt.rs

@@ -188,7 +188,7 @@ extern "C" fn x86_64_aero_main(boot_info: &'static StivaleStruct) -> ! {
     apic::init();
     log::info!("loaded APIC");
 
-    acpi::init(rsdp_address).unwrap();
+    acpi::init(rsdp_address);
     log::info!("loaded ACPI");
 
     tls::init(0);