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

soc/intel/skylake: Use common cpu/intel/car romstage code 

Setting up the console and entering postcar can be done in a common
place.

Change-Id: I8a8db0fcb4f0fbbb121a8195a8a8b6644c28db07
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32962
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Arthur Heymans 2019-05-23 15:07:49 +02:00 committed by Patrick Georgi
parent 73ac12196c
commit 56e2d7d21a
4 changed files with 6 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/drivers/intel/fsp1_1/car.c
View File

@ -15,6 +15,7 @@
#include <arch/symbols.h> #include <arch/symbols.h>
#include <console/console.h> #include <console/console.h>
#include <cpu/intel/romstage.h>
#include <cpu/x86/mtrr.h> #include <cpu/x86/mtrr.h>
#include <fsp/car.h> #include <fsp/car.h>
#include <fsp/util.h> #include <fsp/util.h>
@ -27,7 +28,7 @@
/* platform_enter_postcar() determines the stack to use after /* platform_enter_postcar() determines the stack to use after
* cache-as-ram is torn down as well as the MTRR settings to use, * cache-as-ram is torn down as well as the MTRR settings to use,
* and continues execution in postcar stage. */ * and continues execution in postcar stage. */
static void platform_enter_postcar(void) void platform_enter_postcar(void)
{ {
struct postcar_frame pcf; struct postcar_frame pcf;
size_t alignment; size_t alignment;
@ -153,17 +154,15 @@ asmlinkage void cache_as_ram_main(struct cache_as_ram_params *car_params)
platform_enter_postcar(); platform_enter_postcar();
} }
/* This is the romstage C entry for platforms with /* This is the entry for platforms with CONFIG_C_ENVIRONMENT_BOOTBLOCK
CONFIG_C_ENVIRONMENT_BOOTBLOCK */ called from cpu/intel/car/romstage.c */
asmlinkage void romstage_c_entry(void) void mainboard_romstage_entry(unsigned long bist)
{ {
/* Need to locate the current FSP_INFO_HEADER. The cache-as-ram /* Need to locate the current FSP_INFO_HEADER. The cache-as-ram
* is still enabled. We can directly access work buffer here. */ * is still enabled. We can directly access work buffer here. */
FSP_INFO_HEADER *fih; FSP_INFO_HEADER *fih;
struct prog fsp = PROG_INIT(PROG_REFCODE, "fsp.bin"); struct prog fsp = PROG_INIT(PROG_REFCODE, "fsp.bin");
console_init();
if (prog_locate(&fsp)) { if (prog_locate(&fsp)) {
fih = NULL; fih = NULL;
printk(BIOS_ERR, "Unable to locate %s\n", prog_name(&fsp)); printk(BIOS_ERR, "Unable to locate %s\n", prog_name(&fsp));
@ -174,9 +173,6 @@ asmlinkage void romstage_c_entry(void)
} }
cache_as_ram_stage_main(fih); cache_as_ram_stage_main(fih);
/* we don't return here */
platform_enter_postcar();
} }
void __weak car_mainboard_pre_console_init(void) void __weak car_mainboard_pre_console_init(void)

1
src/drivers/intel/fsp1_1/include/fsp/car.h
View File

@ -31,7 +31,6 @@ struct cache_as_ram_params {
/* Entry points from the cache-as-ram assembly code. */ /* Entry points from the cache-as-ram assembly code. */
asmlinkage void cache_as_ram_main(struct cache_as_ram_params *car_params); asmlinkage void cache_as_ram_main(struct cache_as_ram_params *car_params);
asmlinkage void romstage_c_entry(void);
/* Per stage calls from the above two functions. The void * return from /* Per stage calls from the above two functions. The void * return from
* cache_as_ram_stage_main() is the stack pointer to use in RAM after * cache_as_ram_stage_main() is the stack pointer to use in RAM after
* exiting cache-as-ram mode. */ * exiting cache-as-ram mode. */

2
src/soc/intel/skylake/romstage/Makefile.inc
View File

@ -1,4 +1,4 @@
romstage-$(CONFIG_PLATFORM_USES_FSP1_1) += car_stage.S romstage-$(CONFIG_PLATFORM_USES_FSP1_1) += ../../../../cpu/intel/car/romstage.c
romstage-$(CONFIG_PLATFORM_USES_FSP1_1) += romstage.c romstage-$(CONFIG_PLATFORM_USES_FSP1_1) += romstage.c
romstage-$(CONFIG_PLATFORM_USES_FSP2_0) += romstage_fsp20.c romstage-$(CONFIG_PLATFORM_USES_FSP2_0) += romstage_fsp20.c
romstage-y += systemagent.c romstage-y += systemagent.c

41
src/soc/intel/skylake/romstage/car_stage.S
View File

@ -1,41 +0,0 @@
/*
* This file is part of the coreboot project.
*
* Copyright 2015 Google Inc
*
* 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.
*/
#include <cpu/x86/post_code.h>
/* I/O delay between post codes on failure */
#define LHLT_DELAY 0x50000
.text
.global car_stage_entry
car_stage_entry:
call romstage_c_entry
/* we don't return here */
movb $0x69, %ah
jmp .Lhlt
.Lhlt:
xchg %al, %ah
#if CONFIG(POST_IO)
outb %al, $CONFIG_POST_IO_PORT
#else
post_code(POST_DEAD_CODE)
#endif
movl $LHLT_DELAY, %ecx
.Lhlt_Delay:
outb %al, $0xED
loop .Lhlt_Delay
jmp .Lhlt