From fa3bc049f5ca51eeb35fafb61f043d5a54f30c14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Thu, 31 Mar 2022 07:40:10 +0300 Subject: CBMEM: Change declarations for initialization hooks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There are efforts to have bootflows that do not follow a traditional bootblock-romstage-postcar-ramstage model. As part of that CBMEM initialisation hooks will need to move from romstage to bootblock. The interface towards platforms and drivers will change to use one of CBMEM_CREATION_HOOK() or CBMEM_READY_HOOK(). Former will only be called in the first stage with CBMEM available. Change-Id: Ie24bf4e818ca69f539196c3a814f3c52d4103d7e Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/63375 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans Reviewed-by: Julius Werner Reviewed-by: Raul Rangel --- src/drivers/usb/ehci_debug.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/drivers/usb/ehci_debug.c') diff --git a/src/drivers/usb/ehci_debug.c b/src/drivers/usb/ehci_debug.c index db42ce45ae..178877bc96 100644 --- a/src/drivers/usb/ehci_debug.c +++ b/src/drivers/usb/ehci_debug.c @@ -680,7 +680,7 @@ static void migrate_ehci_debug(int is_recovery) struct ehci_debug_info *dbg_info_cbmem; int rv; - if (ENV_ROMSTAGE) { + if (ENV_CREATES_CBMEM) { /* Move state from CAR to CBMEM. */ struct ehci_debug_info *dbg_info = dbgp_ehci_info(); dbg_info_cbmem = cbmem_add(CBMEM_ID_EHCI_DEBUG, @@ -706,9 +706,7 @@ static void migrate_ehci_debug(int is_recovery) printk(BIOS_DEBUG, "usbdebug: " ENV_STRING " starting...\n"); } -ROMSTAGE_CBMEM_INIT_HOOK(migrate_ehci_debug); -POSTCAR_CBMEM_INIT_HOOK(migrate_ehci_debug); -RAMSTAGE_CBMEM_INIT_HOOK(migrate_ehci_debug); +CBMEM_READY_HOOK(migrate_ehci_debug); int dbgp_ep_is_active(struct dbgp_pipe *pipe) { @@ -728,7 +726,7 @@ struct dbgp_pipe *dbgp_console_input(void) void usbdebug_init(void) { /* USB console init is done early in romstage, yet delayed to - * CBMEM_INIT_HOOKs for postcar and ramstage as we recover state + * CBMEM_READY_HOOKs for postcar and ramstage as we recover state * from CBMEM. */ if (CONFIG(USBDEBUG_IN_PRE_RAM) -- cgit v1.2.3