Change in coreboot[master]: lib/bootblock: Add simplified entry with basetime

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/34972 )

Change subject: lib/bootblock: Add simplified entry with basetime
......................................................................

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 
---
M src/cpu/intel/car/bootblock.c
M src/cpu/qemu-x86/bootblock.c
M src/include/bootblock_common.h
M src/lib/bootblock.c
M src/soc/intel/apollolake/bootblock/bootblock.c
M src/soc/intel/braswell/bootblock/bootblock.c
M src/soc/intel/cannonlake/bootblock/bootblock.c
M src/soc/intel/denverton_ns/bootblock/bootblock.c
M src/soc/intel/icelake/bootblock/bootblock.c
M src/soc/intel/quark/bootblock/bootblock.c
M src/soc/intel/skylake/bootblock/bootblock.c
11 files changed, 19 insertions(+), 10 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/34972/1

diff --git a/src/cpu/intel/car/bootblock.c b/src/cpu/intel/car/bootblock.c
index d751d86..664c2b5 100644
--- a/src/cpu/intel/car/bootblock.c
+++ b/src/cpu/intel/car/bootblock.c
@@ -21,7 +21,7 @@
 {
    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 8dcf576..6459beb 100644
--- a/src/cpu/qemu-x86/bootblock.c
+++ b/src/cpu/qemu-x86/bootblock.c
@@ -29,5 +29,5 @@
    }

/* 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 08b2b7a..da10307 100644
--- a/src/include/bootblock_common.h
+++ b/src/include/bootblock_common.h
@@ -46,8 +46,12 @@
  * entered from C code. This function assumes that the timer has already been
  * initialized, so it does not call init_timer().
  */
+#if 0
 asmlinkage void bootblock_main_with_timestamp(uint64_t base_timestamp,
    struct timestamp_entry *timestamps, size_t num_timestamps);
+#endif
+
+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 3925e90a..7fd70f2 100644
--- a/src/lib/bootblock.c
+++ b/src/lib/bootblock.c
@@ -30,7 +30,7 @@
 __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,
+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 +60,11 @@
    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/intel/apollolake/bootblock/bootblock.c b/src/soc/intel/apollolake/bootblock/bootblock.c
index f86c18e..a07c462 100644
--- a/src/soc/intel/apollolake/bootblock/bootblock.c
+++ b/src/soc/intel/apollolake/bootblock/bootblock.c
@@ -69,7 +69,7 @@
    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 2d1a3e8..d8d953c 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 30c2266..653ba30 100644
--- a/src/soc/intel/cannonlake/bootblock/bootblock.c
+++ b/src/soc/intel/cannonlake/bootblock/bootblock.c
@@ -44,7 +44,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/denverton_ns/bootblock/bootblock.c b/src/soc/intel/denverton_ns/bootblock/bootblock.c
index e9800c8..f75de1f 100644
--- a/src/soc/intel/denverton_ns/bootblock/bootblock.c
+++ b/src/soc/intel/denverton_ns/bootblock/bootblock.c
@@ -51,7 +51,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/icelake/bootblock/bootblock.c b/src/soc/intel/icelake/bootblock/bootblock.c
index b76dc4b..db43e50 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 ff5b9b2..2b2fc29 100644
--- a/src/soc/intel/quark/bootblock/bootblock.c
+++ b/src/soc/intel/quark/bootblock/bootblock.c
@@ -82,7 +82,7 @@
    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 4358fba..e9ca2d8 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)

[Kyösti Mälkki (Code Review)]

Hello Patrick Rudolph, Vanny E, build bot (Jenkins), David Guckian,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/34972

to look at the new patch set (#2).

Change subject: lib/bootblock: Add simplified entry with basetime
......................................................................

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 
---
M src/cpu/intel/car/bootblock.c
M src/cpu/qemu-x86/bootblock.c
M src/include/bootblock_common.h
M src/lib/bootblock.c
M src/soc/amd/stoneyridge/bootblock/bootblock.c
M src/soc/intel/apollolake/bootblock/bootblock.c
M src/soc/intel/braswell/bootblock/bootblock.c
M src/soc/intel/cannonlake/bootblock/bootblock.c
M src/soc/intel/denverton_ns/bootblock/bootblock.c
M src/soc/intel/icelake/bootblock/bootblock.c
M src/soc/intel/quark/bootblock/bootblock.c
M src/soc/intel/skylake/bootblock/bootblock.c
12 files changed, 20 insertions(+), 11 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/34972/2

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34972 )

Change subject: lib/bootblock: Add simplified entry with basetime
......................................................................

Patch Set 3:

(1 comment)

https://review.coreboot.org/c/coreboot/+/34972/3/src/lib/bootblock.c 
File src/lib/bootblock.c:

https://review.coreboot.org/c/coreboot/+/34972/3/src/lib/bootblock.c@68 
PS3, Line 68: void main(void)
I could not figure this out.. will decompressor stage somehow call this? I thought it would enter via _start symbol.

[Julius Werner (Code Review)]

Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34972 )

Change subject: lib/bootblock: Add simplified entry with basetime
......................................................................

Patch Set 3:

(3 comments)

https://review.coreboot.org/c/coreboot/+/34972/3//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/34972/3//COMMIT_MSG@11 
PS3, Line 11: with calls to timestamp_add() gets removed from bootblock.
Are you sure this works that way (did you check the assembly output)? I don't think the compiler will do this because you still have two external functions (main() and bootblock_main_with_basetime()) call a relatively large static function (bootblock_main_with_timestamp()), so the compiler should output it as a separate function rather than duplicating the code to inline it in both callers. We know that one of those two callers will always be garbage collected by the linker, but the compiler doesn't know that at the time it processes that compilation unit in isolation. (Maybe LTO could solve this but we're not using that AFAIK.)

I think just moving all the timestamp handling out of the shared static function into the callers would be the easiest solution (only one of them still needs the whole loop anyway, for the others it's just one timestamp_init() call).

https://review.coreboot.org/c/coreboot/+/34972/3/src/include/bootblock_commo... 
File src/include/bootblock_common.h:

https://review.coreboot.org/c/coreboot/+/34972/3/src/include/bootblock_commo... 
PS3, Line 49: #if 0
Remove rather than #if 0?

https://review.coreboot.org/c/coreboot/+/34972/3/src/lib/bootblock.c 
File src/lib/bootblock.c:

https://review.coreboot.org/c/coreboot/+/34972/3/src/lib/bootblock.c@68 
PS3, Line 68: void main(void)
> I could not figure this out.. […]

This is for normal (non-decompressor) non-x86 builds. For example src/arch/arm64/armv8/bootblock.S calls this from _start. _start is in assembly and this is the C entry point.

Builds with decompressor don't use this (they compile it but it will be GC'ed), they use _start() below.

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34972 )

Change subject: lib/bootblock: Add simplified entry with basetime
......................................................................

Patch Set 3:

(1 comment)

https://review.coreboot.org/c/coreboot/+/34972/3//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/34972/3//COMMIT_MSG@11 
PS3, Line 11: with calls to timestamp_add() gets removed from bootblock.
> Are you sure this works that way (did you check the assembly output)? I don't think the compiler wil […]

Here's the assembly.

ffff5700 <bootblock_main_with_timestamp.constprop.1>:
    ffff5700:	mov    $0xfef05000,%ecx
    ffff5705:	sub    $0xc,%esp
    ffff5708:	sub    $0xfef04e00,%ecx
    ffff570e:	test   %ecx,%ecx
    ffff5710:	jle    ffff571e <bootblock_main_with_timestamp.constprop.1+0x1e>
    ffff5712:	push   %ecx
    ffff5713:	push   %ecx
    ffff5714:	push   %edx
    ffff5715:	push   %eax
    ffff5716:	call   ffff626a <timestamp_init>
    ffff571b:	add    $0x10,%esp
    ffff571e:	call   ffff6350 <bootblock_soc_early_init>
    ffff5723:	call   ffff56ff <bootblock_mainboard_early_init>
    ffff5728:	call   ffff4b80 <console_init>
    ffff572d:	call   ffff45e9 <exception_init>
    ffff5732:	call   ffff636f <bootblock_soc_init>
    ffff5737:	call   ffff631e <bootblock_mainboard_init>
    ffff573c:	add    $0xc,%esp
    ffff573f:	jmp    ffff5aec <run_romstage>

ffff5744 <bootblock_main_with_basetime>:
    ffff5744:	mov    0x4(%esp),%eax
    ffff5748:	mov    0x8(%esp),%edx
    ffff574c:	jmp    ffff5700 <bootblock_main_with_timestamp.constprop.1>

[Julius Werner (Code Review)]

Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34972 )

Change subject: lib/bootblock: Add simplified entry with basetime
......................................................................

Patch Set 5:

(1 comment)

https://review.coreboot.org/c/coreboot/+/34972/3//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/34972/3//COMMIT_MSG@11 
PS3, Line 11: with calls to timestamp_add() gets removed from bootblock.
> Here's the assembly. […]

Ohh... interesting. Looks like the compiler is clever enough to see that both callers (bootblock_main_with_basetime() and main()) always pass NULL and 0 there (and you're not compiling _start() for your build). So I guess we can keep it like this.

[Kyösti Mälkki (Code Review)]

Hello Patrick Rudolph, Vanny E, Julius Werner, build bot (Jenkins), David Guckian,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/34972

to look at the new patch set (#6).

Change subject: lib/bootblock: Add simplified entry with basetime
......................................................................

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 
---
M src/cpu/intel/car/bootblock.c
M src/cpu/qemu-x86/bootblock.c
M src/include/bootblock_common.h
M src/lib/bootblock.c
M src/soc/amd/stoneyridge/bootblock/bootblock.c
M src/soc/intel/apollolake/bootblock/bootblock.c
M src/soc/intel/braswell/bootblock/bootblock.c
M src/soc/intel/cannonlake/bootblock/bootblock.c
M src/soc/intel/denverton_ns/bootblock/bootblock.c
M src/soc/intel/icelake/bootblock/bootblock.c
M src/soc/intel/quark/bootblock/bootblock.c
M src/soc/intel/skylake/bootblock/bootblock.c
12 files changed, 25 insertions(+), 21 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/34972/6

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34972 )

Change subject: lib/bootblock: Add simplified entry with basetime
......................................................................

Patch Set 6:

(3 comments)

https://review.coreboot.org/c/coreboot/+/34972/3//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/34972/3//COMMIT_MSG@11 
PS3, Line 11: with calls to timestamp_add() gets removed from bootblock.
> Ohh... interesting. […]

Done

https://review.coreboot.org/c/coreboot/+/34972/3/src/include/bootblock_commo... 
File src/include/bootblock_common.h:

https://review.coreboot.org/c/coreboot/+/34972/3/src/include/bootblock_commo... 
PS3, Line 49: #if 0
> Remove rather than #if 0?

Done

https://review.coreboot.org/c/coreboot/+/34972/3/src/lib/bootblock.c 
File src/lib/bootblock.c:

https://review.coreboot.org/c/coreboot/+/34972/3/src/lib/bootblock.c@68 
PS3, Line 68: void main(void)
> This is for normal (non-decompressor) non-x86 builds. For example src/arch/arm64/armv8/bootblock. […]

Ack

[Julius Werner (Code Review)]

Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34972 )

Change subject: lib/bootblock: Add simplified entry with basetime
......................................................................

Patch Set 6: Code-Review+2

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/34972 )

Change subject: lib/bootblock: Add simplified entry with basetime
......................................................................

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 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34972
Tested-by: build bot (Jenkins) 
Reviewed-by: Julius Werner 
---
M src/cpu/intel/car/bootblock.c
M src/cpu/qemu-x86/bootblock.c
M src/include/bootblock_common.h
M src/lib/bootblock.c
M src/soc/amd/stoneyridge/bootblock/bootblock.c
M src/soc/intel/apollolake/bootblock/bootblock.c
M src/soc/intel/braswell/bootblock/bootblock.c
M src/soc/intel/cannonlake/bootblock/bootblock.c
M src/soc/intel/denverton_ns/bootblock/bootblock.c
M src/soc/intel/icelake/bootblock/bootblock.c
M src/soc/intel/quark/bootblock/bootblock.c
M src/soc/intel/skylake/bootblock/bootblock.c
12 files changed, 25 insertions(+), 21 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Julius Werner: Looks good to me, approved

diff --git a/src/cpu/intel/car/bootblock.c b/src/cpu/intel/car/bootblock.c
index d751d86..664c2b5 100644
--- a/src/cpu/intel/car/bootblock.c
+++ b/src/cpu/intel/car/bootblock.c
@@ -21,7 +21,7 @@
 {
    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 8dcf576..6459beb 100644
--- a/src/cpu/qemu-x86/bootblock.c
+++ b/src/cpu/qemu-x86/bootblock.c
@@ -29,5 +29,5 @@
    }

/* 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 08b2b7a..1081f27 100644
--- a/src/include/bootblock_common.h
+++ b/src/include/bootblock_common.h
@@ -38,16 +38,7 @@
 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 3925e90a..19841c6 100644
--- a/src/lib/bootblock.c
+++ b/src/lib/bootblock.c
@@ -30,7 +30,15 @@
 __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 @@
    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 9239030..a079ec2 100644
--- a/src/soc/amd/stoneyridge/bootblock/bootblock.c
+++ b/src/soc/amd/stoneyridge/bootblock/bootblock.c
@@ -88,7 +88,7 @@
    }

/* 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 f86c18e..a07c462 100644
--- a/src/soc/intel/apollolake/bootblock/bootblock.c
+++ b/src/soc/intel/apollolake/bootblock/bootblock.c
@@ -69,7 +69,7 @@
    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 2d1a3e8..d8d953c 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 30c2266..653ba30 100644
--- a/src/soc/intel/cannonlake/bootblock/bootblock.c
+++ b/src/soc/intel/cannonlake/bootblock/bootblock.c
@@ -44,7 +44,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/denverton_ns/bootblock/bootblock.c b/src/soc/intel/denverton_ns/bootblock/bootblock.c
index e9800c8..f75de1f 100644
--- a/src/soc/intel/denverton_ns/bootblock/bootblock.c
+++ b/src/soc/intel/denverton_ns/bootblock/bootblock.c
@@ -51,7 +51,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/icelake/bootblock/bootblock.c b/src/soc/intel/icelake/bootblock/bootblock.c
index b76dc4b..db43e50 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 ff5b9b2..2b2fc29 100644
--- a/src/soc/intel/quark/bootblock/bootblock.c
+++ b/src/soc/intel/quark/bootblock/bootblock.c
@@ -82,7 +82,7 @@
    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 4358fba..e9ca2d8 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)