d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stand: More sensible defaults when ConOut is missing

Browse Source 
When ConOut is missing, we used to default to serial. Except we did it
in the worst way possible by just setting the howto bits and not
updating the console setting, which lead to weird behavior where we'd
get some things on the video port, others on serial.

Instead, set console to "efi,comconsole" for this case. Also set
RB_MULTIPLE always (so we get dual consoles from the kernel) and or in
RB_SERIAL when we can't find GOPs that suggest the precense of a video
console. This will put output in the most places and have a sensible
default for 'primary' console.

Sponsored by:		Netflix
Reviewed by:		emaste, manu
Differential Revision:	https://reviews.freebsd.org/D36299
This commit is contained in:
Warner Losh 2022-08-26 15:46:33 -06:00
parent a28f833532
commit df065f699f
4 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stand/efi/loader/Makefile
View File

@ -39,6 +39,8 @@ CFLAGS.bootinfo.c += -I$(SRCTOP)/sys/teken
CFLAGS.bootinfo.c += -I${SRCTOP}/contrib/pnglite
CFLAGS.framebuffer.c += -I$(SRCTOP)/sys/teken
CFLAGS.framebuffer.c += -I${SRCTOP}/contrib/pnglite
CFLAGS.main.c += -I$(SRCTOP)/sys/teken
CFLAGS.main.c += -I${SRCTOP}/contrib/pnglite
CFLAGS.gfx_fb.c += -I$(SRCTOP)/sys/teken
CFLAGS.gfx_fb.c += -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/lz4
CFLAGS.gfx_fb.c += -I${SRCTOP}/contrib/pnglite

15
stand/efi/loader/framebuffer.c
View File

@ -535,6 +535,21 @@ efifb_get_edid(edid_res_list_t *res)
return (rv);
}
bool
efi_has_gop(void)
{
EFI_STATUS status;
EFI_HANDLE *hlist;
UINTN hsize;
hsize = 0;
hlist = NULL;
status = BS->LocateHandle(ByProtocol, &gop_guid, NULL, &hsize, hlist);
return (status == EFI_BUFFER_TOO_SMALL);
}
int
efi_find_framebuffer(teken_gfx_t *gfx_state)
{

2
stand/efi/loader/framebuffer.h
View File

@ -27,11 +27,13 @@
* $FreeBSD$
*/
#include <teken.h>
#include <gfx_fb.h>
#ifndef _EFIFB_H_
#define _EFIFB_H_
bool efi_has_gop(void);
int efi_find_framebuffer(teken_gfx_t *gfx_state);
#endif /* _EFIFB_H_ */

20
stand/efi/loader/main.c
View File

@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$");
#include <smbios.h>
#include "efizfs.h"
#include "framebuffer.h"
#include "loader_efi.h"
@ -760,8 +761,20 @@ parse_uefi_con_out(void)
if (rv != EFI_SUCCESS)
rv = efi_global_getenv("ConOutDev", buf, &sz);
if (rv != EFI_SUCCESS) {
/* If we don't have any ConOut default to serial */
how = RB_SERIAL;
/*
* If we don't have any ConOut default to both. If we have GOP
* make video primary, otherwise just make serial primary. In
* either case, try to use both the 'efi' console which will use
* the GOP, if present and serial. If there's an EFI BIOS that
* omits this, but has a serial port redirect, we'll
* unavioidably get doubled characters (but we'll be right in
* all the other more common cases).
*/
if (efi_has_gop())
how = RB_MULTIPLE;
else
how = RB_MULTIPLE | RB_SERIAL;
setenv("console", "efi,comconsole", 1);
goto out;
}
ep = buf + sz;
@ -949,6 +962,9 @@ main(int argc, CHAR16 *argv[])
setenv("console", "efi", 1);
uhowto = parse_uefi_con_out();
#if defined(__riscv)
/*
* This workaround likely is papering over a real issue
*/
if ((uhowto & RB_SERIAL) != 0)
setenv("console", "comconsole", 1);
#endif