diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2022-03-31 07:40:10 +0300 |
|---|---|---|
| committer | Arthur Heymans <arthur@aheymans.xyz> | 2022-05-20 07:15:39 +0000 |
| commit | fa3bc049f5ca51eeb35fafb61f043d5a54f30c14 (patch) | |
| tree | e362832abc5cc3895e6bb61986111a18b240410f /src/security/tpm/tspi/log.c | |
| parent | 20a87c0bed98fe8817a2dfccf4cd271199aabc1a (diff) | |
CBMEM: Change declarations for initialization hooks
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 <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/63375
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Diffstat (limited to 'src/security/tpm/tspi/log.c')
| -rw-r--r-- | src/security/tpm/tspi/log.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/security/tpm/tspi/log.c b/src/security/tpm/tspi/log.c index 1d6f9acf32..296cb2d108 100644 --- a/src/security/tpm/tspi/log.c +++ b/src/security/tpm/tspi/log.c @@ -39,8 +39,8 @@ struct tcpa_table *tcpa_log_init(void) if (!cbmem_possibly_online() && !CONFIG(VBOOT_RETURN_FROM_VERSTAGE)) return (struct tcpa_table *)_tpm_tcpa_log; - else if (ENV_ROMSTAGE && - !CONFIG(VBOOT_RETURN_FROM_VERSTAGE)) { + else if (ENV_CREATES_CBMEM + && !CONFIG(VBOOT_RETURN_FROM_VERSTAGE)) { tclt = tcpa_cbmem_init(); if (!tclt) return (struct tcpa_table *)_tpm_tcpa_log; @@ -154,7 +154,7 @@ static void recover_tcpa_log(int is_recovery) memcpy(tce->digest, preram_log->entries[i].digest, tce->digest_length); } } -ROMSTAGE_CBMEM_INIT_HOOK(recover_tcpa_log); +CBMEM_CREATION_HOOK(recover_tcpa_log); #endif BOOT_STATE_INIT_ENTRY(BS_PAYLOAD_BOOT, BS_ON_ENTRY, tcpa_log_dump, NULL); |