diff --git a/drivers/acpid/src/acpi.rs b/drivers/acpid/src/acpi.rs
index 94a1eb17..3b376904 100644
--- a/drivers/acpid/src/acpi.rs
+++ b/drivers/acpid/src/acpi.rs
@@ -25,6 +25,14 @@ use amlserde::{AmlSerde, AmlSerdeValue};
 
 #[cfg(target_arch = "x86_64")]
 pub mod dmar;
+#[cfg(target_arch = "x86_64")]
+use self::dmar::Dmar;
+#[cfg(target_arch = "x86_64")]
+pub mod ivrs;
+#[cfg(target_arch = "x86_64")]
+pub mod mcfg;
+#[cfg(target_arch = "x86_64")]
+use self::{ivrs::Ivrs, mcfg::Mcfg};
 use crate::aml_physmem::{AmlPageCache, AmlPhysMemHandler};
 
 /// The raw SDT header struct, as defined by the ACPI specification.
@@ -458,7 +466,12 @@ impl AcpiContext {
         }
 
         Fadt::init(&mut this);
-        //TODO (hangs on real hardware): Dmar::init(&this);
+        // DMAR (Intel VT-d) init — previously disabled due to iterator bug (type_bytes copied
+        // instead of len_bytes in DmarRawIter). Safe to call now: on AMD systems, no DMAR table
+        // exists and this returns early with a warning.
+        Dmar::init(&this);
+        mcfg::Mcfg::init(&this);
+        ivrs::Ivrs::init(&this);
 
         this
     }
diff --git a/drivers/acpid/src/acpi/dmar/mod.rs b/drivers/acpid/src/acpi/dmar/mod.rs
index c42b379a..e4411261 100644
--- a/drivers/acpid/src/acpi/dmar/mod.rs
+++ b/drivers/acpid/src/acpi/dmar/mod.rs
@@ -471,15 +471,19 @@ impl<'sdt> Iterator for DmarRawIter<'sdt> {
 
         let type_bytes = <[u8; 2]>::try_from(type_bytes)
             .expect("expected a 2-byte slice to be convertible to [u8; 2]");
-        let len_bytes = <[u8; 2]>::try_from(type_bytes)
+        let len_bytes = <[u8; 2]>::try_from(len_bytes)
             .expect("expected a 2-byte slice to be convertible to [u8; 2]");
 
-        let ty = u16::from_ne_bytes(type_bytes);
-        let len = u16::from_ne_bytes(len_bytes);
-
-        let len = usize::try_from(len).expect("expected u16 to fit within usize");
+        let len = u16::from_ne_bytes(len_bytes) as usize;
+
+        // Validate minimum entry header size and prevent infinite loops
+        if len < 4 || len > self.bytes.len() {
+            return None;
+        }
+
+        let ty = u16::from_ne_bytes(type_bytes);
 
         if len > remainder.len() {
             log::warn!("DMAR remapping structure length was smaller than the remaining length of the table.");
             return None;
         }