intel/fsp_rangeley: Load BSP microcode in bootblock
Load microcode to BSP in bootblock so later on the FSP TempRamInit call will return with success. The updated fsp1_0 driver calls TempRamInit API with dummy microcode, so FSP will not handle the microcode load. If BSP is not loaded with microcode before calling TempRamInit API, the call will fail with error No Valid Microcode Was Found. Change-Id: I9c55acaf3353a759bb0119f0a5402a704ffb2c4a Signed-off-by: David Guckian <david.guckian@intel.com> Reviewed-on: http://review.coreboot.org/12367 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: York Yang <york.yang@intel.com>
This commit is contained in:
parent
dc4cb05763
commit
5f06d53bdb
|
@ -58,4 +58,16 @@ config CPU_MICROCODE_CBFS_LOC
|
|||
depends on SUPPORT_CPU_UCODE_IN_CBFS
|
||||
default 0xfff60040
|
||||
|
||||
config HAVE_CPU_MICROCODE_FILE
|
||||
bool "Add microcode file"
|
||||
help
|
||||
The microcode binary
|
||||
|
||||
config CPU_MICROCODE_FILE
|
||||
string "Path and filename of CPU microcode"
|
||||
default "microcode.bin"
|
||||
depends on HAVE_CPU_MICROCODE_FILE
|
||||
help
|
||||
The path and filename of the file containing the CPU microcode.
|
||||
|
||||
endif #CPU_INTEL_FSP_MODEL_406DX
|
||||
|
|
|
@ -18,6 +18,10 @@ subdirs-y += ../../x86/name
|
|||
|
||||
ramstage-y += acpi.c
|
||||
|
||||
ifeq ($(CONFIG_HAVE_CPU_MICROCODE_FILE), y)
|
||||
cpu_microcode_bins += $(call strip_quotes,$(CONFIG_CPU_MICROCODE_FILE))
|
||||
endif
|
||||
|
||||
CPPFLAGS_romstage += -I$(src)/cpu/intel/fsp_model_406dx
|
||||
# We don't have microcode for this CPU
|
||||
# Use CONFIG_CPU_MICROCODE_CBFS_EXTERNAL with a binary microcode file
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
#include <stdint.h>
|
||||
#include <arch/cpu.h>
|
||||
#include <cpu/x86/cache.h>
|
||||
#include <cpu/intel/microcode/microcode.c>
|
||||
#include <cpu/x86/msr.h>
|
||||
#include <cpu/x86/mtrr.h>
|
||||
#include <arch/io.h>
|
||||
|
@ -86,6 +87,10 @@ static void bootblock_cpu_init(void)
|
|||
{
|
||||
/* Check for Warm Reset */
|
||||
check_for_warm_reset();
|
||||
|
||||
/* Load microcode before any caching. */
|
||||
intel_update_microcode_from_cbfs();
|
||||
|
||||
enable_rom_caching();
|
||||
set_no_evict_mode_msr();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue