erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UPSTREAM: lib/bootblock: Provide mechanism to pass in an early timestamp

Browse source 
This is useful, for example, in the bootblock, when a timestamp is
available which predates the call to main() in lib/bootblock.c

BUG=None
BRANCH=None
TEST=None

Change-Id: I17bb0add9f2d8721504b2e534dd6904d1201989c
Original-Signed-off-by: Alexandru Gagniuc <alexandrux.gagniuc@intel.com>
Original-Reviewed-on: https://review.coreboot.org/14862
Original-Tested-by: build bot (Jenkins)
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Original-Reviewed-by: Julius Werner <jwerner@chromium.org>
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/346980
Commit-Ready: Martin Roth <martinroth@chromium.org>
Tested-by: Martin Roth <martinroth@chromium.org>
Reviewed-by: Martin Roth <martinroth@chromium.org>
This commit is contained in:
Alexandru Gagniuc 2016-05-16 16:17:39 -07:00 • committed by chrome-bot
commit fb2829a38e
2 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/include/bootblock_common.h
View file

@ -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 */

18
src/lib/bootblock.c
View file

@ -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);
}