vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove broken ivrs/mcfg stubs from acpid base patch

Browse Source 
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 <clio-agent@sisyphuslabs.ai>
This commit is contained in:
Vasilito
2026-04-12 20:42:57 +01:00
parent cf8a0719c8
commit 4f1704b6a4
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
local/patches/base/redox.patch
+3 -11
View File
@@ -2,23 +2,17 @@ diff --git a/drivers/acpid/src/acpi.rs b/drivers/acpid/src/acpi.rs
index 94a1eb17..3b376904 100644 index 94a1eb17..3b376904 100644
--- a/drivers/acpid/src/acpi.rs --- a/drivers/acpid/src/acpi.rs
+++ b/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")] #[cfg(target_arch = "x86_64")]
pub mod dmar; pub mod dmar;
+#[cfg(target_arch = "x86_64")] +#[cfg(target_arch = "x86_64")]
+use self::dmar::Dmar; +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}; use crate::aml_physmem::{AmlPageCache, AmlPhysMemHandler};
/// The raw SDT header struct, as defined by the ACPI specification. /// 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); Fadt::init(&mut this);
- //TODO (hangs on real hardware): Dmar::init(&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 + // instead of len_bytes in DmarRawIter). Safe to call now: on AMD systems, no DMAR table
+ // exists and this returns early with a warning. + // exists and this returns early with a warning.
+ Dmar::init(&this); + Dmar::init(&this);
+ mcfg::Mcfg::init(&this);
+ ivrs::Ivrs::init(&this);
this this
} }