From 101ef0b528461a3fb662db150b16607430a2bd94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Sun, 18 Aug 2019 06:58:42 +0300 Subject: lib/bootblock: Add simplified entry with basetime MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/34972 Tested-by: build bot (Jenkins) Reviewed-by: Julius Werner --- src/cpu/intel/car/bootblock.c | 2 +- src/cpu/qemu-x86/bootblock.c | 2 +- src/include/bootblock_common.h | 11 +---------- src/lib/bootblock.c | 15 ++++++++++++++- src/soc/amd/stoneyridge/bootblock/bootblock.c | 2 +- src/soc/intel/apollolake/bootblock/bootblock.c | 2 +- src/soc/intel/braswell/bootblock/bootblock.c | 2 +- src/soc/intel/cannonlake/bootblock/bootblock.c | 2 +- src/soc/intel/denverton_ns/bootblock/bootblock.c | 2 +- src/soc/intel/icelake/bootblock/bootblock.c | 2 +- src/soc/intel/quark/bootblock/bootblock.c | 2 +- src/soc/intel/skylake/bootblock/bootblock.c | 2 +- 12 files changed, 25 insertions(+), 21 deletions(-) diff --git a/src/cpu/intel/car/bootblock.c b/src/cpu/intel/car/bootblock.c index d751d86272..664c2b5074 100644 --- a/src/cpu/intel/car/bootblock.c +++ b/src/cpu/intel/car/bootblock.c @@ -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) { } diff --git a/src/cpu/qemu-x86/bootblock.c b/src/cpu/qemu-x86/bootblock.c index 8dcf576990..6459beb5d7 100644 --- a/src/cpu/qemu-x86/bootblock.c +++ b/src/cpu/qemu-x86/bootblock.c @@ -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); } diff --git a/src/include/bootblock_common.h b/src/include/bootblock_common.h index 08b2b7ad6d..1081f27453 100644 --- a/src/include/bootblock_common.h +++ b/src/include/bootblock_common.h @@ -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 { diff --git a/src/lib/bootblock.c b/src/lib/bootblock.c index 3925e90afe..19841c6931 100644 --- a/src/lib/bootblock.c +++ b/src/lib/bootblock.c @@ -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; diff --git a/src/soc/amd/stoneyridge/bootblock/bootblock.c b/src/soc/amd/stoneyridge/bootblock/bootblock.c index 9239030d6c..a079ec2561 100644 --- a/src/soc/amd/stoneyridge/bootblock/bootblock.c +++ b/src/soc/amd/stoneyridge/bootblock/bootblock.c @@ -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) diff --git a/src/soc/intel/apollolake/bootblock/bootblock.c b/src/soc/intel/apollolake/bootblock/bootblock.c index f86c18ed43..a07c4620af 100644 --- a/src/soc/intel/apollolake/bootblock/bootblock.c +++ b/src/soc/intel/apollolake/bootblock/bootblock.c @@ -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) diff --git a/src/soc/intel/braswell/bootblock/bootblock.c b/src/soc/intel/braswell/bootblock/bootblock.c index 2d1a3e8687..d8d953c8a7 100644 --- a/src/soc/intel/braswell/bootblock/bootblock.c +++ b/src/soc/intel/braswell/bootblock/bootblock.c @@ -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) diff --git a/src/soc/intel/cannonlake/bootblock/bootblock.c b/src/soc/intel/cannonlake/bootblock/bootblock.c index 30c2266096..653ba30563 100644 --- a/src/soc/intel/cannonlake/bootblock/bootblock.c +++ b/src/soc/intel/cannonlake/bootblock/bootblock.c @@ -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) diff --git a/src/soc/intel/denverton_ns/bootblock/bootblock.c b/src/soc/intel/denverton_ns/bootblock/bootblock.c index e9800c8ae5..f75de1f2d0 100644 --- a/src/soc/intel/denverton_ns/bootblock/bootblock.c +++ b/src/soc/intel/denverton_ns/bootblock/bootblock.c @@ -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) diff --git a/src/soc/intel/icelake/bootblock/bootblock.c b/src/soc/intel/icelake/bootblock/bootblock.c index b76dc4ba37..db43e50ec8 100644 --- a/src/soc/intel/icelake/bootblock/bootblock.c +++ b/src/soc/intel/icelake/bootblock/bootblock.c @@ -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) diff --git a/src/soc/intel/quark/bootblock/bootblock.c b/src/soc/intel/quark/bootblock/bootblock.c index ff5b9b2a52..2b2fc29f59 100644 --- a/src/soc/intel/quark/bootblock/bootblock.c +++ b/src/soc/intel/quark/bootblock/bootblock.c @@ -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) diff --git a/src/soc/intel/skylake/bootblock/bootblock.c b/src/soc/intel/skylake/bootblock/bootblock.c index 4358fba40f..e9ca2d8af2 100644 --- a/src/soc/intel/skylake/bootblock/bootblock.c +++ b/src/soc/intel/skylake/bootblock/bootblock.c @@ -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) -- cgit v1.2.3