diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2018-12-29 09:40:40 +0200 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2019-01-06 13:19:05 +0000 |
| commit | 63649d24fd616dad397a4ae18f9aede43c6ce2dc (patch) | |
| tree | df6c66c50a330d79d81c315f43547f0fdc45978e /src/drivers/usb | |
| parent | a144e4d6fa93b9ba129b3aa8991cc5fb2ec3c8a6 (diff) | |
usbdebug: Refactor init calls
Expose the function that can unconditionally re-initialise
EHCI debug host and gadget.
Given the missing header in soc/intel files that prevented
building with USBDEBUG_IN_ROMSTAGE=y, it is not actually
known if those SOCs work at all for usbdebug.
Change-Id: I8ae7e144a89a8f7e5f9d307ba4e73d4f96401a79
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/30557
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Diffstat (limited to 'src/drivers/usb')
| -rw-r--r-- | src/drivers/usb/ehci_debug.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/drivers/usb/ehci_debug.c b/src/drivers/usb/ehci_debug.c index 52b4bdde6b..fdd2c72785 100644 --- a/src/drivers/usb/ehci_debug.c +++ b/src/drivers/usb/ehci_debug.c @@ -648,11 +648,19 @@ void usbdebug_disable(void) #endif -static int usbdebug_hw_init(void) +int usbdebug_hw_init(bool force) { struct ehci_debug_info *dbg_info = dbgp_ehci_info(); unsigned int ehci_base, dbg_offset; + if (dbgp_enabled() && !force) + return 0; + + /* Do not attempt slow gadget init in postcar. */ + if (ENV_POSTCAR) + return -1; + + /* Do full init if state claims we are still not enabled. */ if (ehci_debug_hw_enable(&ehci_base, &dbg_offset)) return -1; return usbdebug_init_(ehci_base, dbg_offset, dbg_info); @@ -682,12 +690,7 @@ static void migrate_ehci_debug(int is_recovery) car_set_var(glob_dbg_info_p, dbg_info_cbmem); } - /* Redo full init in ramstage if state claims we - * are still not enabled. Should never happen. */ - rv = dbgp_enabled() ? 0 : -1; - if (!ENV_POSTCAR && rv < 0) - rv = usbdebug_hw_init(); - + rv = usbdebug_hw_init(false); if (rv < 0) printk(BIOS_DEBUG, "usbdebug: Failed hardware init\n"); else @@ -720,11 +723,11 @@ void usbdebug_init(void) * from CBMEM. */ if (IS_ENABLED(CONFIG_USBDEBUG_IN_ROMSTAGE) && ENV_ROMSTAGE) - usbdebug_hw_init(); + usbdebug_hw_init(false); /* USB console init is done early in ramstage if it was * not done in romstage, this does not require CBMEM. */ if (!IS_ENABLED(CONFIG_USBDEBUG_IN_ROMSTAGE) && ENV_RAMSTAGE) - usbdebug_hw_init(); + usbdebug_hw_init(false); } |