Files
RedBear-OS/local/patches/base/P2-acpi-defer-aml.patch
T
vasilito c0587f9a2d refactor: deconsolidate redox.patch into individual patches
The 556MB monolithic redox.patch was impossible to manage, unreviewable,
blocked GitHub pushes, and could only grow. This commit:

- Moves all 64 absorbed patches from absorbed/ to active use in base/
- Removes the absorbed/ directory (consolidation history is now PATCH-HISTORY.md)
- Removes the redox.patch symlink from recipes/core/base/
- Fixes all recipe symlinks to point to active patches (not absorbed/)
- Patches are now individually wired, reviewable, and independently rebasable

The redox.patch mega-file is no longer needed — individual patches
are applied directly from the recipe.toml patches list.
2026-05-03 08:35:26 +01:00

32 lines
1.3 KiB
Diff

Defer AML initialization until PCI registration completes.
When acpid starts before pcid has registered the PCI fd, AML
initialization fails with a misleading ERROR-level message. This is
expected on every boot because the service ordering requires acpid to
start before pcid-spawner. The AML interpreter initializes successfully
after pcid registers via /scheme/acpi/register_pci.
Changes:
- aml_context_mut(): log at DEBUG instead of ERROR when PCI fd is None
(expected pre-registration state, not a fault)
- Fadt::init(): skip \\_S5 evaluation when PCI is not yet registered,
since refresh_s5_values() is retried in register_pci_fd() after PCI
registration completes
diff -urN a/drivers/acpid/src/acpi.rs b/drivers/acpid/src/acpi.rs
--- a/drivers/acpid/src/acpi.rs
+++ b/drivers/acpid/src/acpi.rs
@@ -896,7 +896,11 @@
match self.init(pci_fd) {
Ok(()) => (),
Err(err) => {
- log::error!("failed to initialize AML context: {}", err);
+ if pci_fd.is_none() {
+ log::debug!("AML init deferred until PCI registration: {}", err);
+ } else {
+ log::error!("failed to initialize AML context: {}", err);
+ }
}
}
}