lib/bootblock: Add simplified entry with basetime
This allows for minor optimization as num_timestamps becomes a constant zero for a function with local scope. The loop with calls to timestamp_add() gets removed from bootblock. Change-Id: Id230075c0e76fe377b6ea8c8ddf8318e07d29b91 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34972 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
parent
cd7a70f487
commit
101ef0b528
|
@ -21,7 +21,7 @@ asmlinkage void bootblock_c_entry_bist(uint64_t base_timestamp, uint32_t bist)
|
|||
{
|
||||
saved_bist = bist;
|
||||
/* Call lib/bootblock.c main */
|
||||
bootblock_main_with_timestamp(base_timestamp, NULL, 0);
|
||||
bootblock_main_with_basetime(base_timestamp);
|
||||
}
|
||||
|
||||
void __weak bootblock_early_northbridge_init(void) { }
|
||||
|
|
|
@ -29,5 +29,5 @@ asmlinkage void bootblock_c_entry_bist(uint64_t base_timestamp, uint32_t bist)
|
|||
}
|
||||
|
||||
/* Call lib/bootblock.c main */
|
||||
bootblock_main_with_timestamp(base_timestamp, NULL, 0);
|
||||
bootblock_main_with_basetime(base_timestamp);
|
||||
}
|
||||
|
|
|
@ -38,16 +38,7 @@ void bootblock_soc_init(void);
|
|||
asmlinkage void bootblock_c_entry(uint64_t base_timestamp);
|
||||
asmlinkage void bootblock_c_entry_bist(uint64_t base_timestamp, uint32_t bist);
|
||||
|
||||
/*
|
||||
* This is a the same as the bootblock main(), with the difference that it does
|
||||
* not collect a timestamp. Instead it accepts the initial timestamp and
|
||||
* possibly additional timestamp entries as arguments. This can be used in cases
|
||||
* where earlier stamps are 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().
|
||||
*/
|
||||
asmlinkage void bootblock_main_with_timestamp(uint64_t base_timestamp,
|
||||
struct timestamp_entry *timestamps, size_t num_timestamps);
|
||||
void bootblock_main_with_basetime(uint64_t base_timestamp);
|
||||
|
||||
/* This is the argument structure passed from decompressor to bootblock. */
|
||||
struct bootblock_arg {
|
||||
|
|
|
@ -30,7 +30,15 @@ __weak void bootblock_soc_early_init(void) { /* do nothing */ }
|
|||
__weak void bootblock_soc_init(void) { /* do nothing */ }
|
||||
__weak void bootblock_mainboard_init(void) { /* do nothing */ }
|
||||
|
||||
asmlinkage void bootblock_main_with_timestamp(uint64_t base_timestamp,
|
||||
/*
|
||||
* This is a the same as the bootblock main(), with the difference that it does
|
||||
* not collect a timestamp. Instead it accepts the initial timestamp and
|
||||
* possibly additional timestamp entries as arguments. This can be used in cases
|
||||
* where earlier stamps are 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().
|
||||
*/
|
||||
static void bootblock_main_with_timestamp(uint64_t base_timestamp,
|
||||
struct timestamp_entry *timestamps, size_t num_timestamps)
|
||||
{
|
||||
/* Initialize timestamps if we have TIMESTAMP region in memlayout.ld. */
|
||||
|
@ -60,6 +68,11 @@ asmlinkage void bootblock_main_with_timestamp(uint64_t base_timestamp,
|
|||
run_romstage();
|
||||
}
|
||||
|
||||
void bootblock_main_with_basetime(uint64_t base_timestamp)
|
||||
{
|
||||
bootblock_main_with_timestamp(base_timestamp, NULL, 0);
|
||||
}
|
||||
|
||||
void main(void)
|
||||
{
|
||||
uint64_t base_timestamp = 0;
|
||||
|
|
|
@ -88,7 +88,7 @@ asmlinkage void bootblock_c_entry(uint64_t base_timestamp)
|
|||
}
|
||||
|
||||
/* TSC cannot be relied upon. Override the TSC value passed in. */
|
||||
bootblock_main_with_timestamp(timestamp_get(), NULL, 0);
|
||||
bootblock_main_with_basetime(timestamp_get());
|
||||
}
|
||||
|
||||
void bootblock_soc_early_init(void)
|
||||
|
|
|
@ -69,7 +69,7 @@ asmlinkage void bootblock_c_entry(uint64_t base_timestamp)
|
|||
enable_rtc_upper_bank();
|
||||
|
||||
/* Call lib/bootblock.c main */
|
||||
bootblock_main_with_timestamp(base_timestamp, NULL, 0);
|
||||
bootblock_main_with_basetime(base_timestamp);
|
||||
}
|
||||
|
||||
static void enable_pmcbar(void)
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
asmlinkage void bootblock_c_entry(uint64_t base_timestamp)
|
||||
{
|
||||
/* Call lib/bootblock.c main */
|
||||
bootblock_main_with_timestamp(base_timestamp, NULL, 0);
|
||||
bootblock_main_with_basetime(base_timestamp);
|
||||
}
|
||||
|
||||
static void program_base_addresses(void)
|
||||
|
|
|
@ -44,7 +44,7 @@ const FSPT_UPD temp_ram_init_params = {
|
|||
asmlinkage void bootblock_c_entry(uint64_t base_timestamp)
|
||||
{
|
||||
/* Call lib/bootblock.c main */
|
||||
bootblock_main_with_timestamp(base_timestamp, NULL, 0);
|
||||
bootblock_main_with_basetime(base_timestamp);
|
||||
}
|
||||
|
||||
void bootblock_soc_early_init(void)
|
||||
|
|
|
@ -51,7 +51,7 @@ const FSPT_UPD temp_ram_init_params = {
|
|||
asmlinkage void bootblock_c_entry(uint64_t base_timestamp)
|
||||
{
|
||||
/* Call lib/bootblock.c main */
|
||||
bootblock_main_with_timestamp(base_timestamp, NULL, 0);
|
||||
bootblock_main_with_basetime(base_timestamp);
|
||||
};
|
||||
|
||||
void bootblock_soc_early_init(void)
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
asmlinkage void bootblock_c_entry(uint64_t base_timestamp)
|
||||
{
|
||||
/* Call lib/bootblock.c main */
|
||||
bootblock_main_with_timestamp(base_timestamp, NULL, 0);
|
||||
bootblock_main_with_basetime(base_timestamp);
|
||||
}
|
||||
|
||||
void bootblock_soc_early_init(void)
|
||||
|
|
|
@ -82,7 +82,7 @@ asmlinkage void bootblock_c_entry(uint64_t base_timestamp)
|
|||
if (CONFIG(ENABLE_DEBUG_LED_BOOTBLOCK_ENTRY))
|
||||
light_sd_led();
|
||||
|
||||
bootblock_main_with_timestamp(base_timestamp, NULL, 0);
|
||||
bootblock_main_with_basetime(base_timestamp);
|
||||
}
|
||||
|
||||
void bootblock_soc_early_init(void)
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
asmlinkage void bootblock_c_entry(uint64_t base_timestamp)
|
||||
{
|
||||
/* Call lib/bootblock.c main */
|
||||
bootblock_main_with_timestamp(base_timestamp, NULL, 0);
|
||||
bootblock_main_with_basetime(base_timestamp);
|
||||
}
|
||||
|
||||
void bootblock_soc_early_init(void)
|
||||
|
|
Loading…
Reference in New Issue