Nico Huber submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Martin Roth: Looks good to me, approved Nico Huber: Looks good to me, approved Paul Menzel: Looks good to me, but someone else must approve
timestamps: Fix TIMESTAMPS_ON_CONSOLE behaviour

As logging is guarded by Kconfig, increase the level from BIOS_SPEW
to BIOS_INFO.

The original callsite inside timestamp_add_table_entry() was also
called when syncing from timestamps from .bss to CBMEM. We should
not reprint the values then.

Change-Id: I72ca4b6a04d8734c141a04e651fc8c23932b1f23
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38300
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
---
M src/Kconfig
M src/lib/timestamp.c
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Kconfig b/src/Kconfig
index 762cf89..9118914 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -224,7 +224,7 @@
default n
depends on COLLECT_TIMESTAMPS
help
- Print the timestamps to the debug console if enabled at level spew.
+ Print the timestamps to the debug console if enabled at level info.

config USE_BLOBS
bool "Allow use of binary-only repository"
diff --git a/src/lib/timestamp.c b/src/lib/timestamp.c
index 7c7210c..d2206f6 100644
--- a/src/lib/timestamp.c
+++ b/src/lib/timestamp.c
@@ -130,9 +130,6 @@
tse->entry_id = id;
tse->entry_stamp = ts_time - ts_table->base_time;

- if (CONFIG(TIMESTAMPS_ON_CONSOLE))
- printk(BIOS_SPEW, "Timestamp - %s: %llu\n", timestamp_name(id), ts_time);
-
if (ts_table->num_entries == ts_table->max_entries)
printk(BIOS_ERR, "ERROR: Timestamp table full\n");
}
@@ -152,6 +149,9 @@
}

timestamp_add_table_entry(ts_table, id, ts_time);
+
+ if (CONFIG(TIMESTAMPS_ON_CONSOLE))
+ printk(BIOS_INFO, "Timestamp - %s: %llu\n", timestamp_name(id), ts_time);
}

void timestamp_add_now(enum timestamp_id id)

To view, visit change 38300. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I72ca4b6a04d8734c141a04e651fc8c23932b1f23
Gerrit-Change-Number: 38300
Gerrit-PatchSet: 3
Gerrit-Owner: Kyösti Mälkki <kyosti.malkki@gmail.com>
Gerrit-Reviewer: Julius Werner <jwerner@chromium.org>
Gerrit-Reviewer: Kyösti Mälkki <kyosti.malkki@gmail.com>
Gerrit-Reviewer: Martin Roth <martinroth@google.com>
Gerrit-Reviewer: Nico Huber <nico.h@gmx.de>
Gerrit-Reviewer: Paul Menzel <paulepanter@users.sourceforge.net>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-MessageType: merged