git: e5d4e036f247 - main - stand/efi/eficom: Make aarch64 compat code probe correctly
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 25 May 2023 04:34:04 UTC
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=e5d4e036f2476927369615d4c29651dd2eb3b8a1
commit e5d4e036f2476927369615d4c29651dd2eb3b8a1
Author: Warner Losh <imp@FreeBSD.org>
AuthorDate: 2023-05-24 22:34:44 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-05-25 04:33:53 +0000
stand/efi/eficom: Make aarch64 compat code probe correctly
Make the compat code more correct by probing using the eficom console
structure, not the comconsole one.
Sponsored by: Netflix
Reviewed by: kevans
Differential Revision: https://reviews.freebsd.org/D40222
---
stand/efi/libefi/eficom.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/stand/efi/libefi/eficom.c b/stand/efi/libefi/eficom.c
index 586202efee00..6ff8512dedd7 100644
--- a/stand/efi/libefi/eficom.c
+++ b/stand/efi/libefi/eficom.c
@@ -362,10 +362,13 @@ comc_probe(struct console *sc)
static void
comc_probe_compat(struct console *sc)
{
- comc_probe(sc);
- if (sc->c_flags & (C_PRESENTIN | C_PRESENTOUT)) {
+ comc_probe(&eficom);
+ if (eficom.c_flags & (C_PRESENTIN | C_PRESENTOUT)) {
printf("comconsole: comconsole device name is deprecated, switch to eficom\n");
}
+ /*
+ * Note: We leave the present bits unset in sc to avoid ghosting.
+ */
}
#endif