From 4f1704b6a419e6b0b1c5107078ed2a33f15f01ee Mon Sep 17 00:00:00 2001 From: Vasilito Date: Sun, 12 Apr 2026 20:42:57 +0100 Subject: [PATCH] Remove broken ivrs/mcfg stubs from acpid base patch The base patch referenced ivrs and mcfg modules that don't exist in the source tree, causing build failures. Removed the module declarations, imports, and init calls. MCFG is already handled by pcid (the PCI daemon). IVRS (AMD IOMMU) needs real implementation, not a stub. DMAR iterator fix and Dmar::init() call preserved. Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent) Co-authored-by: Sisyphus --- local/patches/base/redox.patch | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/local/patches/base/redox.patch b/local/patches/base/redox.patch index ae7b66b6..a57ed6b0 100644 --- a/local/patches/base/redox.patch +++ b/local/patches/base/redox.patch @@ -2,23 +2,17 @@ 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}; +@@ -25,6 +25,8 @@ 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 { - } +@@ -458,7 +460,10 @@ impl AcpiContext { + } Fadt::init(&mut this); - //TODO (hangs on real hardware): Dmar::init(&this); @@ -26,8 +20,6 @@ index 94a1eb17..3b376904 100644 + // 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 }