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

usbdebug: Fix reserve in CAR 

We need sizeof(struct ehci_dbg_info) of 88 but only
reserved 64 bytes. If usbdebug_hw_init() was called
late in romstage, for some builds it would corrupt
CAR_GLOBALs like console_inited variable and stop
logging anything.

Also change pointer initialisation such that
glob_dbg_info will hit garbage collection for
PRE_RAM stages.

Change-Id: Ib49fca781e55619179aa8888e2d859560e050876
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/31174
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Kyösti Mälkki 2019-01-31 08:29:32 +02:00
parent 909be6a7d8
commit f88208e0ac
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/arch/x86/car.ld
View File

@ -67,7 +67,8 @@
_car_drivers_storage_end = .; _car_drivers_storage_end = .;
#endif #endif
_car_ehci_dbg_info_start = .; _car_ehci_dbg_info_start = .;
. += 64; /* Reserve sizeof(struct ehci_dbg_info). */
. += 88;
_car_ehci_dbg_info_end = .; _car_ehci_dbg_info_end = .;
/* _car_global_start and _car_global_end provide symbols to per-stage /* _car_global_start and _car_global_end provide symbols to per-stage
* variables that are not shared like the timestamp and the pre-ram * variables that are not shared like the timestamp and the pre-ram

3
src/arch/x86/include/arch/symbols.h
View File

@ -35,6 +35,9 @@ extern char _car_stack_end[];
#define _car_stack_size (_car_stack_end - _car_stack_start) #define _car_stack_size (_car_stack_end - _car_stack_start)
extern char _car_ehci_dbg_info_start[]; extern char _car_ehci_dbg_info_start[];
extern char _car_ehci_dbg_info_end[];
#define _car_ehci_dbg_info_size \
(_car_ehci_dbg_info_end - _car_ehci_dbg_info_start)
/* /*
* The _car_relocatable_data_[start|end] symbols cover CAR data which is * The _car_relocatable_data_[start|end] symbols cover CAR data which is

19
src/drivers/usb/ehci_debug.c
View File

@ -66,13 +66,18 @@ static struct ehci_debug_info * glob_dbg_info_p CAR_GLOBAL;
static inline struct ehci_debug_info *dbgp_ehci_info(void) static inline struct ehci_debug_info *dbgp_ehci_info(void)
{ {
if (IS_ENABLED(CONFIG_USBDEBUG_IN_PRE_RAM) if (car_get_var(glob_dbg_info_p) == NULL) {
&& (ENV_ROMSTAGE || ENV_BOOTBLOCK || ENV_VERSTAGE)) struct ehci_debug_info *info;
glob_dbg_info_p = if (ENV_BOOTBLOCK || ENV_VERSTAGE || ENV_ROMSTAGE) {
(struct ehci_debug_info *)_car_ehci_dbg_info_start; /* The message likely does not show if we hit this. */
if (car_get_var(glob_dbg_info_p) == NULL) if (sizeof(*info) > _car_ehci_dbg_info_size)
car_set_var(glob_dbg_info_p, &glob_dbg_info); die("BUG: Increase ehci_dbg_info reserve in CAR");
info = (void *)_car_ehci_dbg_info_start;
} else {
info = &glob_dbg_info;
}
car_set_var(glob_dbg_info_p, info);
}
return car_get_var(glob_dbg_info_p); return car_get_var(glob_dbg_info_p);
} }