timestamps: Further simplify timestamp_reinit()

Allocation of new table always happens in romstage.

Change-Id: I089a84b372893fb3018a796fb1e16cd58753bdf4
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35374
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Kyösti Mälkki 2019-09-12 12:58:50 +03:00
parent b2536f418f
commit b6b13c9f29
1 changed files with 7 additions and 14 deletions

View File

@ -265,21 +265,14 @@ static void timestamp_reinit(int is_recovery)
if (!timestamp_should_run()) if (!timestamp_should_run())
return; return;
/* cbmem is being recovered. */ /* First time into romstage we make a clean new table. For platforms that travel
if (is_recovery) { through this path on resume, ARCH_X86 S3, timestamps are also reset. */
/* x86 resume path expects timestamps to be reset. */ if (ENV_ROMSTAGE) {
if (CONFIG(ARCH_ROMSTAGE_X86_32) && ENV_ROMSTAGE)
ts_cbmem_table = timestamp_alloc_cbmem_table();
else {
/* Find existing table in cbmem. */
ts_cbmem_table = cbmem_find(CBMEM_ID_TIMESTAMP);
/* No existing timestamp table. */
if (ts_cbmem_table == NULL)
ts_cbmem_table = timestamp_alloc_cbmem_table();
}
} else
/* First time sync. Add new table. */
ts_cbmem_table = timestamp_alloc_cbmem_table(); ts_cbmem_table = timestamp_alloc_cbmem_table();
} else {
/* Find existing table in cbmem. */
ts_cbmem_table = cbmem_find(CBMEM_ID_TIMESTAMP);
}
if (ts_cbmem_table == NULL) { if (ts_cbmem_table == NULL) {
printk(BIOS_ERR, "ERROR: No timestamp table allocated\n"); printk(BIOS_ERR, "ERROR: No timestamp table allocated\n");