From 1c105903078f85dd1be805c737b4e4da6dea0618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Sun, 23 Dec 2018 07:22:59 +0200 Subject: arch/x86: Use a common timestamp.inc with romcc bootblocks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://review.coreboot.org/c/30393 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans --- src/arch/x86/bootblock_romcc.S | 6 ++---- src/arch/x86/timestamp.inc | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 src/arch/x86/timestamp.inc (limited to 'src/arch') diff --git a/src/arch/x86/bootblock_romcc.S b/src/arch/x86/bootblock_romcc.S index 6c1723a4c1..bfcc1e61a9 100644 --- a/src/arch/x86/bootblock_romcc.S +++ b/src/arch/x86/bootblock_romcc.S @@ -19,7 +19,7 @@ * - reset16.inc: the reset vector * - entry16.inc: protected mode 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 * * This is used on platforms which do not select C_ENVIRONMENT_BOOTBLOCK, and it @@ -35,9 +35,7 @@ #include #include -#ifdef CONFIG_CHIPSET_BOOTBLOCK_INCLUDE -#include CONFIG_CHIPSET_BOOTBLOCK_INCLUDE -#endif +#include #if IS_ENABLED(CONFIG_SSE) #include diff --git a/src/arch/x86/timestamp.inc b/src/arch/x86/timestamp.inc new file mode 100644 index 0000000000..3115c22c67 --- /dev/null +++ b/src/arch/x86/timestamp.inc @@ -0,0 +1,33 @@ +/* + * 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 -- cgit v1.2.3