diff options
| -rw-r--r-- | src/soc/intel/apollolake/bootblock/bootblock.c | 5 | ||||
| -rw-r--r-- | src/soc/intel/apollolake/bootblock/cache_as_ram.S | 6 | ||||
| -rw-r--r-- | src/soc/intel/apollolake/include/soc/bootblock.h | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/src/soc/intel/apollolake/bootblock/bootblock.c b/src/soc/intel/apollolake/bootblock/bootblock.c index 77d98d98be..82794327c9 100644 --- a/src/soc/intel/apollolake/bootblock/bootblock.c +++ b/src/soc/intel/apollolake/bootblock/bootblock.c @@ -26,6 +26,7 @@ #include <soc/northbridge.h> #include <soc/pci_devs.h> #include <soc/uart.h> +#include <timestamp.h> static const struct pad_config tpm_spi_configs[] = { PAD_CFG_NF(GPIO_106, NATIVE, DEEP, NF3), /* FST_SPI_CS2_N */ @@ -53,7 +54,7 @@ static void enable_pm_timer(void) wrmsr(MSR_EMULATE_PM_TMR, msr); } -void asmlinkage bootblock_c_entry(void) +void asmlinkage bootblock_c_entry(uint32_t tsc_hi, uint32_t tsc_lo) { device_t dev = NB_DEV_ROOT; @@ -67,7 +68,7 @@ void asmlinkage bootblock_c_entry(void) pci_write_config16(dev, PCI_COMMAND, PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY); /* Call lib/bootblock.c main */ - main(); + bootblock_main_with_timestamp(((uint64_t)tsc_hi << 32) | tsc_lo); } static void cache_bios_region(void) diff --git a/src/soc/intel/apollolake/bootblock/cache_as_ram.S b/src/soc/intel/apollolake/bootblock/cache_as_ram.S index cd301ac5e9..f19cb71f55 100644 --- a/src/soc/intel/apollolake/bootblock/cache_as_ram.S +++ b/src/soc/intel/apollolake/bootblock/cache_as_ram.S @@ -129,6 +129,12 @@ car_init_done: before_carstage: post_code(0x2b) + /* Restore the timestamp from bootblock_crt0.S (mm2:mm1) */ + movd %mm1, %eax + push %eax + movd %mm2, %eax + push %eax + /* We can call into C functions now */ call bootblock_c_entry diff --git a/src/soc/intel/apollolake/include/soc/bootblock.h b/src/soc/intel/apollolake/include/soc/bootblock.h index 2312487d82..9ce9231098 100644 --- a/src/soc/intel/apollolake/include/soc/bootblock.h +++ b/src/soc/intel/apollolake/include/soc/bootblock.h @@ -16,5 +16,5 @@ #define _SOC_APOLLOLAKE_BOOTBLOCK_H_ #include <arch/cpu.h> -void asmlinkage bootblock_c_entry(void); +void asmlinkage bootblock_c_entry(uint32_t tsc_hi, uint32_t tsc_lo); #endif |