GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arch/x86: Use a common timestamp.inc with romcc bootblocks 

The same file was replicated three times for certain
soc/intel bootblocks, yet there are no indications or need to do
chipset-specific initialisation.

There is no harm in storing the TSC values in MMX registers
even when they would not be used.

Change-Id: Iec6fa0889f5887effca1d99ef830d383fb733648
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/30393
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
This commit is contained in:
Kyösti Mälkki 2018-12-23 07:22:59 +02:00
parent 3ba79b319e
commit 1c10590307
7 changed files with 2 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/arch/x86/bootblock_romcc.S
View File

@ -19,7 +19,7 @@
* - reset16.inc: the reset vector * - reset16.inc: the reset vector
* - entry16.inc: protected mode setup * - entry16.inc: protected mode setup
* - entry32.inc: segment descriptor setup * - entry32.inc: segment descriptor setup
* - CONFIG_CHIPSET_BOOTBLOCK_INCLUDE: chipset-specific initialization * - timestamp.inc: store TSC in MMX registers
* - generated/bootblock.inc: ROMCC part of the bootblock * - generated/bootblock.inc: ROMCC part of the bootblock
* *
* This is used on platforms which do not select C_ENVIRONMENT_BOOTBLOCK, and it * This is used on platforms which do not select C_ENVIRONMENT_BOOTBLOCK, and it
@ -35,9 +35,7 @@
#include <cpu/x86/16bit/reset16.inc> #include <cpu/x86/16bit/reset16.inc>
#include <cpu/x86/32bit/entry32.inc> #include <cpu/x86/32bit/entry32.inc>
#ifdef CONFIG_CHIPSET_BOOTBLOCK_INCLUDE #include <arch/x86/timestamp.inc>
#include CONFIG_CHIPSET_BOOTBLOCK_INCLUDE
#endif
#if IS_ENABLED(CONFIG_SSE) #if IS_ENABLED(CONFIG_SSE)
#include <cpu/x86/sse_enable.inc> #include <cpu/x86/sse_enable.inc>

0
src/soc/intel/baytrail/bootblock/timestamp.inc → src/arch/x86/timestamp.inc
View File

4
src/soc/intel/baytrail/Kconfig
View File

@ -166,8 +166,4 @@ config REFCODE_BLOB_FILE
endif # HAVE_REFCODE_BLOB endif # HAVE_REFCODE_BLOB
config CHIPSET_BOOTBLOCK_INCLUDE
string
default "soc/intel/baytrail/bootblock/timestamp.inc"
endif endif

4
src/soc/intel/braswell/Kconfig
View File

@ -123,10 +123,6 @@ config IED_REGION_SIZE
hex hex
default 0x400000 default 0x400000
config CHIPSET_BOOTBLOCK_INCLUDE
string
default "soc/intel/braswell/bootblock/timestamp.inc"
config DISABLE_HPET config DISABLE_HPET
bool "Disable the HPET device" bool "Disable the HPET device"
default n default n

33
src/soc/intel/braswell/bootblock/timestamp.inc
View File

@ -1,33 +0,0 @@
/*
* This file is part of the coreboot project.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
/*
* Store the initial timestamp for booting in mmx registers. This works
* because the bootblock isn't being compiled with MMX support so mm0 and
* mm1 will be preserved into romstage.
*/
.code32
.global stash_timestamp
stash_timestamp:
/* Save the BIST value */
movl %eax, %ebp
finit
rdtsc
movd %eax, %mm0
movd %edx, %mm1
/* Restore the BIST value to %eax */
movl %ebp, %eax

4
src/soc/intel/broadwell/Kconfig
View File

@ -204,8 +204,4 @@ config REFCODE_BLOB_FILE
endif # HAVE_REFCODE_BLOB endif # HAVE_REFCODE_BLOB
config CHIPSET_BOOTBLOCK_INCLUDE
string
default "soc/intel/broadwell/bootblock/timestamp.inc"
endif endif

33
src/soc/intel/broadwell/bootblock/timestamp.inc
View File

@ -1,33 +0,0 @@
/*
* This file is part of the coreboot project.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
/*
* Store the initial timestamp for booting in mmx registers. This works
* because the bootblock isn't being compiled with MMX support so mm0 and
* mm1 will be preserved into romstage.
*/
.code32
.global stash_timestamp
stash_timestamp:
/* Save the BIST value */
movl %eax, %ebp
finit
rdtsc
movd %eax, %mm0
movd %edx, %mm1
/* Restore the BIST value to %eax */
movl %ebp, %eax