summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Gagniuc <alexandrux.gagniuc@intel.com>2016-05-16 16:17:39 -0700
committerAaron Durbin <adurbin@chromium.org>2016-05-19 18:26:42 +0200
commitff196b62274abd55c62083efe89f43085c1143d3 (patch)
tree2e1d4a0a8aa3abc60d12881c8077c7442ce3d769
parent63e7b5b8a7dc69d1546ccd0d2ee4fcce8a2cc67d (diff)
lib/bootblock: Provide mechanism to pass in an early timestamp
This is useful, for example, in the bootblock, when a timestamp is available which predates the call to main() in lib/bootblock.c Change-Id: I17bb0add9f2d8721504b2e534dd6904d1201989c Signed-off-by: Alexandru Gagniuc <alexandrux.gagniuc@intel.com> Reviewed-on: https://review.coreboot.org/14862 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Julius Werner <jwerner@chromium.org>
-rw-r--r--src/include/bootblock_common.h10
-rw-r--r--src/lib/bootblock.c18
2 files changed, 24 insertions, 4 deletions
diff --git a/src/include/bootblock_common.h b/src/include/bootblock_common.h
index 2cecc3b645..b227cf47be 100644
--- a/src/include/bootblock_common.h
+++ b/src/include/bootblock_common.h
@@ -17,6 +17,7 @@
#define __BOOTBLOCK_COMMON_H
#include <main_decl.h>
+#include <stdint.h>
/*
* These are defined as weak no-ops that can be overridden by mainboard/SoC.
@@ -27,5 +28,14 @@ void bootblock_mainboard_early_init(void);
void bootblock_mainboard_init(void);
void bootblock_soc_early_init(void);
void bootblock_soc_init(void);
+/*
+ * This is a the same as the bootblock main(), with the difference that it does
+ * not collect a timestamp. Instead it accepts the first timestamp as an
+ * argument. This can be used in cases where an earlier stamp is available
+ * Note that this function is designed to be entered from C code.
+ * This function assumes that the timer has already been initialized, so it
+ * does not call init_timer().
+ */
+void bootblock_main_with_timestamp(uint64_t base_timestamp);
#endif /* __BOOTBLOCK_COMMON_H */
diff --git a/src/lib/bootblock.c b/src/lib/bootblock.c
index 658eea45c9..f16cb44df6 100644
--- a/src/lib/bootblock.c
+++ b/src/lib/bootblock.c
@@ -29,13 +29,11 @@ __attribute__((weak)) void bootblock_soc_early_init(void) { /* do nothing */ }
__attribute__((weak)) void bootblock_soc_init(void) { /* do nothing */ }
__attribute__((weak)) void bootblock_mainboard_init(void) { /* do nothing */ }
-void main(void)
+void bootblock_main_with_timestamp(uint64_t base_timestamp)
{
- init_timer();
-
/* Initialize timestamps if we have TIMESTAMP region in memlayout.ld. */
if (IS_ENABLED(CONFIG_COLLECT_TIMESTAMPS) && _timestamp_size > 0)
- timestamp_init(timestamp_get());
+ timestamp_init(base_timestamp);
bootblock_soc_early_init();
bootblock_mainboard_early_init();
@@ -50,3 +48,15 @@ void main(void)
run_romstage();
}
+
+void main(void)
+{
+ uint64_t base_timestamp = 0;
+
+ init_timer();
+
+ if (IS_ENABLED(CONFIG_COLLECT_TIMESTAMPS))
+ base_timestamp = timestamp_get();
+
+ bootblock_main_with_timestamp(base_timestamp);
+}