AML: add predefined global lock mutex object to the namespace

Author: IsaacWoods

src/aml/mod.rs

@@ -48,6 +48,9 @@ use object::{
 use op_region::{OpRegion, RegionHandler, RegionSpace};
 use spinning_top::Spinlock;
 
+/// `Interpreter` implements a virtual machine for the dynamic AML bytecode. It can be used by a
+/// host operating system to load tables containing AML bytecode (generally the DSDT and SSDTs) and
+/// will then manage the AML namespace and all objects created during the life of the system.
 pub struct Interpreter<H>
 where
     H: Handler,
@@ -58,6 +61,7 @@ where
     context_stack: Spinlock<Vec<MethodContext>>,
     dsdt_revision: u8,
     region_handlers: Spinlock<BTreeMap<RegionSpace, Box<dyn RegionHandler>>>,
+    global_lock_mutex: Handle,
 }
 
 unsafe impl<H> Send for Interpreter<H> where H: Handler + Send {}
@@ -74,13 +78,17 @@ where
     /// already, use [`Interpreter::new_from_tables`] instead.
     pub fn new(handler: H, dsdt_revision: u8) -> Interpreter<H> {
         info!("Initializing AML interpreter v{}", env!("CARGO_PKG_VERSION"));
+
+        let global_lock_mutex = handler.create_mutex();
+
         Interpreter {
             handler,
-            namespace: Spinlock::new(Namespace::new()),
+            namespace: Spinlock::new(Namespace::new(global_lock_mutex)),
             object_token: Spinlock::new(unsafe { ObjectToken::create_interpreter_token() }),
             context_stack: Spinlock::new(Vec::new()),
             dsdt_revision,
             region_handlers: Spinlock::new(BTreeMap::new()),
+            global_lock_mutex,
         }
     }
 

src/aml/namespace.rs

@@ -1,5 +1,6 @@
 use super::{
     AmlError,
+    Handle,
     object::{Object, ObjectType, WrappedObject},
 };
 use alloc::{
@@ -19,7 +20,7 @@ pub struct Namespace {
 
 impl Namespace {
     /// Create a new AML namespace, with the expected pre-defined objects.
-    pub fn new() -> Namespace {
+    pub fn new(global_lock_mutex: Handle) -> Namespace {
         let mut namespace = Namespace { root: NamespaceLevel::new(NamespaceLevelKind::Scope) };
 
         namespace.add_level(AmlName::from_str("\\_GPE").unwrap(), NamespaceLevelKind::Scope).unwrap();
@@ -28,6 +29,13 @@ impl Namespace {
         namespace.add_level(AmlName::from_str("\\_PR").unwrap(), NamespaceLevelKind::Scope).unwrap();
         namespace.add_level(AmlName::from_str("\\_TZ").unwrap(), NamespaceLevelKind::Scope).unwrap();
 
+        namespace
+            .insert(
+                AmlName::from_str("\\_GL").unwrap(),
+                Object::Mutex { mutex: global_lock_mutex, sync_level: 0 }.wrap(),
+            )
+            .unwrap();
+
         /*
          * In the dark ages of ACPI 1.0, before `\_OSI`, `\_OS` was used to communicate to the firmware which OS
          * was running. This was predictably not very good, and so was replaced in ACPI 3.0 with `_OSI`, which
@@ -122,8 +130,6 @@ impl Namespace {
          */
         namespace.insert(AmlName::from_str("\\_REV").unwrap(), Object::Integer(2).wrap()).unwrap();
 
-        // TODO: _GL
-
         namespace
     }