soc/intel: Consolidate FSP CAR setup and teardown code
This patch adds following changes, - APL, CFL, DENVERTON soc's using same implementation to setup and teardown FSP CAR. Hence cache_as_ram_fsp.S from soc folder is cosolidated into one file and moved to common code CPU car folder. - exit_car_fsp.S is from APL, DNV soc folder is clubbed into one file and moved to common CPU car. - The new file apollolake/fspcar.c is addded to pass tempraminit parameters. - Coffee lake Soc uses FSPT to support Intel Security features like BootGuard verify boot and Measured boot. Add FSP CAR support for CFL by programming tempraminit parameters and add FSP_T_XIP default if FSP_CAR is selected. BUG= None TEST= Build for both CFL RVP11 & RVP8 and verified for successful CAR setup. Build for both leafhill and harcuvar platform by selecting CONFIG_FSP_CAR without errors. Change-Id: I98d2dd9711ddc0d7ea7d1672fba700259ee3a3a9 Signed-off-by: Praveen hodagatta pranesh <praveenx.hodagatta.pranesh@intel.com> Reviewed-on: https://review.coreboot.org/29209 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Furquan Shaikh <furquan@google.com>
This commit is contained in:
committed by
Patrick Georgi
parent
ac6a5080ec
commit
b66757fc58
@@ -1,10 +1,12 @@
|
||||
bootblock-$(CONFIG_SOC_INTEL_COMMON_BLOCK_CAR) += car/cache_as_ram.S
|
||||
bootblock-$(CONFIG_FSP_CAR)+= car/cache_as_ram_fsp.S
|
||||
bootblock-$(CONFIG_SOC_INTEL_COMMON_BLOCK_CPU) += cpulib.c
|
||||
|
||||
romstage-$(CONFIG_SOC_INTEL_COMMON_BLOCK_CAR) += car/exit_car.S
|
||||
romstage-$(CONFIG_SOC_INTEL_COMMON_BLOCK_CPU) += cpulib.c
|
||||
|
||||
postcar-$(CONFIG_SOC_INTEL_COMMON_BLOCK_CAR) += car/exit_car.S
|
||||
postcar-$(CONFIG_FSP_CAR) += car/exit_car_fsp.S
|
||||
|
||||
ramstage-$(CONFIG_SOC_INTEL_COMMON_BLOCK_CPU) += cpulib.c
|
||||
ramstage-$(CONFIG_SOC_INTEL_COMMON_BLOCK_CPU_MPINIT) += mp_init.c
|
||||
|
117
src/soc/intel/common/block/cpu/car/cache_as_ram_fsp.S
Normal file
117
src/soc/intel/common/block/cpu/car/cache_as_ram_fsp.S
Normal file
@@ -0,0 +1,117 @@
|
||||
/*
|
||||
* This file is part of the coreboot project.
|
||||
*
|
||||
* Copyright (C) 2018 Intel Corp.
|
||||
*
|
||||
* 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; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* 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 <device/pci_def.h>
|
||||
#include <cpu/x86/mtrr.h>
|
||||
#include <cpu/x86/cache.h>
|
||||
#include <cpu/x86/cr.h>
|
||||
#include <cpu/x86/post_code.h>
|
||||
#include <../../../../../arch/x86/walkcbfs.S>
|
||||
|
||||
|
||||
.extern temp_ram_init_params
|
||||
|
||||
.global bootblock_pre_c_entry
|
||||
bootblock_pre_c_entry:
|
||||
|
||||
.global cache_as_ram
|
||||
cache_as_ram:
|
||||
post_code(0x21)
|
||||
|
||||
/* find fsp in cbfs */
|
||||
lea fsp_name, %esi
|
||||
mov $1f, %esp
|
||||
jmp walkcbfs_asm
|
||||
1:
|
||||
cmp $0, %eax
|
||||
jz .halt_forever
|
||||
mov CBFS_FILE_OFFSET(%eax), %ebx
|
||||
bswap %ebx
|
||||
add %eax, %ebx
|
||||
add $0x94, %ebx
|
||||
|
||||
/*
|
||||
* save mm2 into ebp, because TempRamInit API doesn't preserve
|
||||
* mm2 register
|
||||
*/
|
||||
movd %mm2, %ebp
|
||||
|
||||
/*
|
||||
* ebx = FSP INFO HEADER
|
||||
* Calculate entry into FSP
|
||||
*/
|
||||
movl 0x30(%ebx), %eax /* Load TempRamInitEntryOffset */
|
||||
addl 0x1c(%ebx), %eax /* add the FSP ImageBase */
|
||||
|
||||
/*
|
||||
* Pass early init variables on a fake stack (no memory yet)
|
||||
* as well as the return location
|
||||
*/
|
||||
leal CAR_init_stack, %esp
|
||||
|
||||
/* call FSP binary to setup temporary stack */
|
||||
jmp *%eax
|
||||
|
||||
/*
|
||||
* If the TempRamInit API is successful, then when returning, the ECX and
|
||||
* EDX registers will point to the temporary but writeable memory range
|
||||
* available to the bootloader where ECX is the start and EDX is the end of
|
||||
* the range i.e. [ECX,EDX). See FSP Integration Guide for more information.
|
||||
*
|
||||
* Return Values:
|
||||
* EAX | Return Status
|
||||
* ECX | Temporary Memory Start
|
||||
* EDX | Temporary Memory End
|
||||
* EBX, EDI, ESI, EBP, MM0, MM1 | Preserved Through API Call
|
||||
*/
|
||||
|
||||
CAR_init_done:
|
||||
cmp $0, %eax
|
||||
jnz .halt_forever
|
||||
|
||||
/* Setup bootblock stack */
|
||||
mov %edx, %esp
|
||||
|
||||
/* clear CAR_GLOBAL area as it is not shared */
|
||||
cld
|
||||
xor %eax, %eax
|
||||
movl $(_car_global_end), %ecx
|
||||
movl $(_car_global_start), %edi
|
||||
sub %edi, %ecx
|
||||
shrl $2, %ecx
|
||||
rep stosl
|
||||
|
||||
/* Restore the timestamp from bootblock_crt0.S (ebp:mm1) */
|
||||
push %ebp
|
||||
movd %mm1, %eax
|
||||
push %eax
|
||||
|
||||
/* We can call into C functions now */
|
||||
call bootblock_c_entry
|
||||
|
||||
/* Never reached */
|
||||
|
||||
.halt_forever:
|
||||
post_code(POST_DEAD_CODE)
|
||||
hlt
|
||||
jmp .halt_forever
|
||||
|
||||
CAR_init_stack:
|
||||
.long CAR_init_done
|
||||
.long temp_ram_init_params
|
||||
|
||||
fsp_name:
|
||||
.string "fspt.bin"
|
38
src/soc/intel/common/block/cpu/car/exit_car_fsp.S
Normal file
38
src/soc/intel/common/block/cpu/car/exit_car_fsp.S
Normal file
@@ -0,0 +1,38 @@
|
||||
/*
|
||||
* This file is part of the coreboot project.
|
||||
*
|
||||
* Copyright (C) 2018 Intel Corp.
|
||||
*
|
||||
* 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/mtrr.h>
|
||||
#include <cpu/x86/cr.h>
|
||||
|
||||
/*
|
||||
* This path for CAR teardown is taken when CONFIG_FSP_CAR is employed.
|
||||
* This version of chipset_teardown_car sets up the stack, then bypasses
|
||||
* the rest of arch/x86/exit_car.S and calls main() itself instead of
|
||||
* returning to _start. In main(), the TempRamExit FSP API is called
|
||||
* to tear down the CAR and set up caching which can be overwritten
|
||||
* after the API call. More info can be found in the FSP Integration
|
||||
* Guide included with the FSP binary.
|
||||
*/
|
||||
|
||||
.text
|
||||
.global chipset_teardown_car
|
||||
chipset_teardown_car:
|
||||
|
||||
/* Set up new stack. */
|
||||
mov post_car_stack_top, %esp
|
||||
|
||||
/* Call C code */
|
||||
call main
|
Reference in New Issue
Block a user