Andy-Python-Programmer
diff --git a/‎src/aero_kernel/src/acpi/aml.rs
Copy file name to clipboardExpand all lines: src/aero_kernel/src/acpi/aml.rs
+7Lines changed: 7 additions & 0 deletions b/‎src/aero_kernel/src/acpi/aml.rs
Copy file name to clipboardExpand all lines: src/aero_kernel/src/acpi/aml.rs
+7Lines changed: 7 additions & 0 deletions
diff --git a/‎src/aero_kernel/src/arch/x86_64/interrupts/mod.rs
Copy file name to clipboardExpand all lines: src/aero_kernel/src/arch/x86_64/interrupts/mod.rs
+4Lines changed: 4 additions & 0 deletions b/‎src/aero_kernel/src/arch/x86_64/interrupts/mod.rs
Copy file name to clipboardExpand all lines: src/aero_kernel/src/arch/x86_64/interrupts/mod.rs
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎src/aero_kernel/src/arch/x86_64/mod.rs
Copy file name to clipboardExpand all lines: src/aero_kernel/src/arch/x86_64/mod.rs
+7Lines changed: 7 additions & 0 deletions b/‎src/aero_kernel/src/arch/x86_64/mod.rs
Copy file name to clipboardExpand all lines: src/aero_kernel/src/arch/x86_64/mod.rs
+7Lines changed: 7 additions & 0 deletions
diff --git a/‎src/aero_kernel/src/drivers/lai.rs
Copy file name to clipboardExpand all lines: src/aero_kernel/src/drivers/lai.rs
+4-9Lines changed: 4 additions & 9 deletions b/‎src/aero_kernel/src/drivers/lai.rs
Copy file name to clipboardExpand all lines: src/aero_kernel/src/drivers/lai.rs
+4-9Lines changed: 4 additions & 9 deletions
diff --git a/‎src/aero_kernel/src/main.rs
Copy file name to clipboardExpand all lines: src/aero_kernel/src/main.rs
+2Lines changed: 2 additions & 0 deletions b/‎src/aero_kernel/src/main.rs
Copy file name to clipboardExpand all lines: src/aero_kernel/src/main.rs
+2Lines changed: 2 additions & 0 deletions
@@ -10,6 +10,13 @@ pub enum SleepState {
 
 pub trait AmlSubsystem: Send + Sync {
     fn enter_state(&self, state: SleepState);
+    /// Ensures that the system control interrupt (SCI) is properly
+    /// configured, disables SCI event sources, installs the SCI handler, and
+    /// transfers the system hardware into ACPI mode.
+    ///
+    /// ## Parameters
+    /// * `mode` - IRQ mode (ACPI spec section 5.8.1)
+    fn enable_acpi(&self, mode: u32);
 }
 
 static AML_SUBSYSTEM: Once<Arc<dyn AmlSubsystem>> = Once::new();
 
@@ -67,6 +67,10 @@ impl InterruptController {
         }
     }
 
+    pub fn method(&self) -> usize {
+        self.method.load(Ordering::SeqCst)
+    }
+
     /// Send EOI, indicating the completion of an interrupt.
     pub fn eoi(&self) {
         match self.method.load(Ordering::Acquire) {
 
@@ -26,6 +26,7 @@ pub mod task;
 pub mod tls;
 
 use crate::acpi;
+use crate::acpi::aml;
 use crate::apic;
 use crate::cmdline;
 use crate::mem;
@@ -42,6 +43,8 @@ use crate::utils::io;
 use raw_cpuid::CpuId;
 use stivale_boot::v2::*;
 
+use self::interrupts::INTERRUPT_CONTROLLER;
+
 #[repr(C, align(4096))]
 struct P2Align12<T>(T);
 
@@ -234,6 +237,10 @@ extern "C" fn x86_64_aero_ap_main(ap_id: usize, stack_top_addr: VirtAddr) {
     crate::aero_ap_main(ap_id);
 }
 
+pub fn enable_acpi() {
+    aml::get_subsystem().enable_acpi(INTERRUPT_CONTROLLER.method() as _);
+}
+
 pub fn init_cpu() {
     unsafe {
         // Enable the no-execute page protection feature.
 
@@ -42,32 +42,26 @@ impl lai::Host for LaiHost {
     }
 
     // Port I/O functions:
-    #[inline]
     fn outb(&self, port: u16, value: u8) {
         unsafe { io::outb(port, value) }
     }
 
-    #[inline]
     fn outw(&self, port: u16, value: u16) {
         unsafe { io::outw(port, value) }
     }
 
-    #[inline]
     fn outd(&self, port: u16, value: u32) {
         unsafe { io::outl(port, value) }
     }
 
-    #[inline]
     fn inb(&self, port: u16) -> u8 {
         unsafe { io::inb(port) }
     }
 
-    #[inline]
     fn inw(&self, port: u16) -> u16 {
         unsafe { io::inw(port) }
     }
 
-    #[inline]
     fn ind(&self, port: u16) -> u32 {
         unsafe { io::inl(port) }
     }
@@ -91,7 +85,6 @@ impl lai::Host for LaiHost {
     }
 
     // Memory functions:
-    #[inline]
     fn map(&self, address: usize, _count: usize) -> *mut u8 {
         PhysAddr::new(address as u64)
             .as_hhdm_virt()
@@ -105,6 +98,10 @@ impl aml::AmlSubsystem for LaiSubsystem {
     fn enter_state(&self, state: aml::SleepState) {
         lai::enter_sleep(state as u8)
     }
+
+    fn enable_acpi(&self, mode: u32) {
+        lai::enable_acpi(mode);
+    }
 }
 
 pub fn init_lai() {
@@ -114,8 +111,6 @@ pub fn init_lai() {
     lai::set_acpi_revision(get_acpi_table().revision() as _);
     lai::create_namespace();
 
-    lai::enable_acpi(1);
-
     let subsystem = Arc::new(LaiSubsystem);
     aml::init(subsystem);
 }
 
@@ -144,6 +144,8 @@ fn kernel_main_thread() {
     modules::init();
     log::info!("loaded kernel modules");
 
+    arch::enable_acpi();
+
     drivers::pci::init(&mut offset_table);
     log::info!("loaded PCI driver");
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,10 @@ impl InterruptController {`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
	`70`	`+ pub fn method(&self) -> usize {`
	`71`	`+ self.method.load(Ordering::SeqCst)`
	`72`	`+ }`
	`73`	`+`
`70`	`74`	`/// Send EOI, indicating the completion of an interrupt.`
`71`	`75`	`pub fn eoi(&self) {`
`72`	`76`	`match self.method.load(Ordering::Acquire) {`
Original file line number	Diff line number	Diff line change
`@@ -42,32 +42,26 @@ impl lai::Host for LaiHost {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`// Port I/O functions:`
`45`		`- #[inline]`
`46`	`45`	`fn outb(&self, port: u16, value: u8) {`
`47`	`46`	`unsafe { io::outb(port, value) }`
`48`	`47`	`}`
`49`	`48`
`50`		`- #[inline]`
`51`	`49`	`fn outw(&self, port: u16, value: u16) {`
`52`	`50`	`unsafe { io::outw(port, value) }`
`53`	`51`	`}`
`54`	`52`
`55`		`- #[inline]`
`56`	`53`	`fn outd(&self, port: u16, value: u32) {`
`57`	`54`	`unsafe { io::outl(port, value) }`
`58`	`55`	`}`
`59`	`56`
`60`		`- #[inline]`
`61`	`57`	`fn inb(&self, port: u16) -> u8 {`
`62`	`58`	`unsafe { io::inb(port) }`
`63`	`59`	`}`
`64`	`60`
`65`		`- #[inline]`
`66`	`61`	`fn inw(&self, port: u16) -> u16 {`
`67`	`62`	`unsafe { io::inw(port) }`
`68`	`63`	`}`
`69`	`64`
`70`		`- #[inline]`
`71`	`65`	`fn ind(&self, port: u16) -> u32 {`
`72`	`66`	`unsafe { io::inl(port) }`
`73`	`67`	`}`
`@@ -91,7 +85,6 @@ impl lai::Host for LaiHost {`
`91`	`85`	`}`
`92`	`86`
`93`	`87`	`// Memory functions:`
`94`		`- #[inline]`
`95`	`88`	`fn map(&self, address: usize, _count: usize) -> *mut u8 {`
`96`	`89`	`PhysAddr::new(address as u64)`
`97`	`90`	`.as_hhdm_virt()`
`@@ -105,6 +98,10 @@ impl aml::AmlSubsystem for LaiSubsystem {`
`105`	`98`	`fn enter_state(&self, state: aml::SleepState) {`
`106`	`99`	`lai::enter_sleep(state as u8)`
`107`	`100`	`}`
	`101`	`+`
	`102`	`+ fn enable_acpi(&self, mode: u32) {`
	`103`	`+ lai::enable_acpi(mode);`
	`104`	`+ }`
`108`	`105`	`}`
`109`	`106`
`110`	`107`	`pub fn init_lai() {`
`@@ -114,8 +111,6 @@ pub fn init_lai() {`
`114`	`111`	`lai::set_acpi_revision(get_acpi_table().revision() as _);`
`115`	`112`	`lai::create_namespace();`
`116`	`113`
`117`		`- lai::enable_acpi(1);`
`118`		`-`
`119`	`114`	`let subsystem = Arc::new(LaiSubsystem);`
`120`	`115`	`aml::init(subsystem);`
`121`	`116`	`}`