GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpayload: Make 8250 UART driver relocation safe 

`lib_sysinfo->serial` is a virtual pointer into coreboot tables.
It's not valid across relocation. Accessing the wrong value during
relocation of FILO resulted in a hang with DEBUG_SEGMENT and UART
console enabled. Work around that by caching the whole table entry
locally.

An alternative would be to revise `sysinfo`, to contain no virtual
pointers to anything outside the payload.

Change-Id: I03adaf57b83a177316d7778f7e06df8eb6f9158e
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37513
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Reto Buerki <reet@codelabs.ch>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Nico Huber 2019-12-05 13:49:19 +01:00 committed by Nico Huber
parent b81147cb56
commit e6b0a32cb3
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
payloads/libpayload/drivers/serial/8250.c
View File

@ -31,7 +31,9 @@
#include <libpayload-config.h> #include <libpayload-config.h>
#include <libpayload.h> #include <libpayload.h>
#define IOBASE lib_sysinfo.serial->baseaddr static struct cb_serial cb_serial;
#define IOBASE cb_serial.baseaddr
#define MEMBASE (phys_to_virt(IOBASE)) #define MEMBASE (phys_to_virt(IOBASE))
static int serial_hardware_is_present = 0; static int serial_hardware_is_present = 0;
@ -39,14 +41,14 @@ static int serial_is_mem_mapped = 0;
static uint8_t serial_read_reg(int offset) static uint8_t serial_read_reg(int offset)
{ {
offset *= lib_sysinfo.serial->regwidth; offset *= cb_serial.regwidth;
#if CONFIG(LP_IO_ADDRESS_SPACE) #if CONFIG(LP_IO_ADDRESS_SPACE)
if (!serial_is_mem_mapped) if (!serial_is_mem_mapped)
return inb(IOBASE + offset); return inb(IOBASE + offset);
else else
#endif #endif
if (lib_sysinfo.serial->regwidth == 4) if (cb_serial.regwidth == 4)
return readl(MEMBASE + offset) & 0xff; return readl(MEMBASE + offset) & 0xff;
else else
return readb(MEMBASE + offset); return readb(MEMBASE + offset);
@ -54,14 +56,14 @@ static uint8_t serial_read_reg(int offset)
static void serial_write_reg(uint8_t val, int offset) static void serial_write_reg(uint8_t val, int offset)
{ {
offset *= lib_sysinfo.serial->regwidth; offset *= cb_serial.regwidth;
#if CONFIG(LP_IO_ADDRESS_SPACE) #if CONFIG(LP_IO_ADDRESS_SPACE)
if (!serial_is_mem_mapped) if (!serial_is_mem_mapped)
outb(val, IOBASE + offset); outb(val, IOBASE + offset);
else else
#endif #endif
if (lib_sysinfo.serial->regwidth == 4) if (cb_serial.regwidth == 4)
writel(val & 0xff, MEMBASE + offset); writel(val & 0xff, MEMBASE + offset);
else else
writeb(val, MEMBASE + offset); writeb(val, MEMBASE + offset);
@ -108,11 +110,7 @@ static struct console_output_driver consout = {
void serial_init(void) void serial_init(void)
{ {
if (!lib_sysinfo.serial) serial_is_mem_mapped = (cb_serial.type == CB_SERIAL_TYPE_MEMORY_MAPPED);
return;
serial_is_mem_mapped =
(lib_sysinfo.serial->type == CB_SERIAL_TYPE_MEMORY_MAPPED);
if (!serial_is_mem_mapped) { if (!serial_is_mem_mapped) {
#if CONFIG(LP_IO_ADDRESS_SPACE) #if CONFIG(LP_IO_ADDRESS_SPACE)
@ -130,15 +128,16 @@ void serial_init(void)
#if CONFIG(LP_SERIAL_SET_SPEED) #if CONFIG(LP_SERIAL_SET_SPEED)
serial_hardware_init(CONFIG_LP_SERIAL_BAUD_RATE, 8, 0, 1); serial_hardware_init(CONFIG_LP_SERIAL_BAUD_RATE, 8, 0, 1);
#endif #endif
serial_hardware_is_present = 1;
} }
void serial_console_init(void) void serial_console_init(void)
{ {
if (!lib_sysinfo.serial) if (!lib_sysinfo.serial)
return; return;
cb_serial = *lib_sysinfo.serial;
serial_init(); serial_init();
serial_hardware_is_present = 1;
console_add_input_driver(&consin); console_add_input_driver(&consin);
console_add_output_driver(&consout); console_add_output_driver(&consout);