git: 61fd6a1ea296 - main - Note that static hints no longer break loader hints
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 26 Apr 2023 05:39:00 UTC
The branch main has been updated by kevans:
URL: https://cgit.FreeBSD.org/src/commit/?id=61fd6a1ea2961736952ef060b625637f9816343c
commit 61fd6a1ea2961736952ef060b625637f9816343c
Author: Kyle Evans <kevans@FreeBSD.org>
AuthorDate: 2023-04-26 05:38:32 +0000
Commit: Kyle Evans <kevans@FreeBSD.org>
CommitDate: 2023-04-26 05:38:32 +0000
Note that static hints no longer break loader hints
This commentary was carried over from the x86 version of the same code,
but has actually been inaccurate for a while now. As of FreeBSD 12.x,
all environments are used unless they disable each other. See
39d44f7f15c ("kern_environment: use any provided environments [...]")
for details.
Reviewed by: imp
Differentiala Revision: https://reviews.freebsd.org/D35695
---
stand/efi/loader/arch/arm64/exec.c | 8 +++-----
sys/arm64/acpica/OsdEnvironment.c | 3 +--
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/stand/efi/loader/arch/arm64/exec.c b/stand/efi/loader/arch/arm64/exec.c
index 3cf1c1857f51..a8cd80cd0fc6 100644
--- a/stand/efi/loader/arch/arm64/exec.c
+++ b/stand/efi/loader/arch/arm64/exec.c
@@ -83,11 +83,9 @@ elf64_exec(struct preloaded_file *fp)
/*
* Report the RSDP to the kernel. The old code used the 'hints' method
- * to communite this to the kernel. However, while convenient, the
- * 'hints' method is fragile and does not work when static hints are
- * compiled into the kernel. Instead, move to setting different tunables
- * that start with acpi. The old 'hints' can be removed before we branch
- * for FreeBSD 15.
+ * to communicate this to the kernel, but this is now considered legacy.
+ * Instead, move to setting different tunables that start with acpi.
+ * The old 'hints' can be removed before we branch for FreeBSD 15.
*/
rsdp = efi_get_table(&acpi20_guid);
diff --git a/sys/arm64/acpica/OsdEnvironment.c b/sys/arm64/acpica/OsdEnvironment.c
index d1590bee7753..2659d1c7da84 100644
--- a/sys/arm64/acpica/OsdEnvironment.c
+++ b/sys/arm64/acpica/OsdEnvironment.c
@@ -65,8 +65,7 @@ acpi_get_root_from_loader(void)
return (acpi_root);
/*
- * The hints mechanism is unreliable (it fails if anybody ever
- * compiled in hints to the kernel). It has been replaced
+ * The hints mechanism is considered legacy and has been replaced
* by the tunable method, but is used here as a fallback to
* retain maximum compatibility between old loaders and new
* kernels. It can be removed after 14.0R.