diff options
| -rw-r--r-- | src/cpu/intel/microcode/microcode.c | 30 | ||||
| -rw-r--r-- | src/cpu/intel/model_206ax/bootblock.c | 6 | ||||
| -rw-r--r-- | src/cpu/intel/model_206ax/model_206ax_init.c | 7 | ||||
| -rw-r--r-- | src/include/cpu/intel/microcode.h | 11 |
4 files changed, 52 insertions, 2 deletions
diff --git a/src/cpu/intel/microcode/microcode.c b/src/cpu/intel/microcode/microcode.c index ec42fb91d7..af83faf69d 100644 --- a/src/cpu/intel/microcode/microcode.c +++ b/src/cpu/intel/microcode/microcode.c @@ -1,6 +1,7 @@ /* * This file is part of the coreboot project. * + * Copyright (C) 2012 The ChromiumOS Authors. All rights reserved. * Copyright (C) 2000 Ronald G. Minnich * * This program is free software; you can redistribute it and/or modify @@ -27,6 +28,14 @@ #include <cpu/x86/msr.h> #include <cpu/intel/microcode.h> +#if CONFIG_MICROCODE_IN_CBFS +#ifdef __PRE_RAM__ +#include <arch/cbfs.h> +#else +#include <cbfs.h> +#endif +#endif + struct microcode { u32 hdrver; /* Header Version */ u32 rev; /* Update Revision */ @@ -68,6 +77,9 @@ static inline u32 read_microcode_rev(void) return msr.hi; } +#if CONFIG_MICROCODE_IN_CBFS +static +#endif void intel_update_microcode(const void *microcode_updates) { u32 eax; @@ -131,3 +143,21 @@ void intel_update_microcode(const void *microcode_updates) } } } + +#if CONFIG_MICROCODE_IN_CBFS + +#define MICROCODE_CBFS_FILE "microcode_blob.bin" + +void intel_update_microcode_from_cbfs(void) +{ + void *microcode_blob; + +#ifdef __PRE_RAM__ + microcode_blob = walkcbfs((char *) MICROCODE_CBFS_FILE); +#else + microcode_blob = cbfs_find_file(MICROCODE_CBFS_FILE, + CBFS_TYPE_MICROCODE); +#endif + intel_update_microcode(microcode_blob); +} +#endif diff --git a/src/cpu/intel/model_206ax/bootblock.c b/src/cpu/intel/model_206ax/bootblock.c index 62d9b4edeb..4061bb7b5a 100644 --- a/src/cpu/intel/model_206ax/bootblock.c +++ b/src/cpu/intel/model_206ax/bootblock.c @@ -23,9 +23,11 @@ #include <cpu/x86/msr.h> #include <cpu/x86/mtrr.h> +#if !CONFIG_MICROCODE_IN_CBFS static const uint32_t microcode_updates[] = { #include "microcode_blob.h" }; +#endif #include <cpu/intel/microcode/microcode.c> @@ -61,5 +63,9 @@ static void enable_rom_caching(void) static void bootblock_cpu_init(void) { enable_rom_caching(); +#if CONFIG_MICROCODE_IN_CBFS + intel_update_microcode_from_cbfs(); +#else intel_update_microcode(microcode_updates); +#endif } diff --git a/src/cpu/intel/model_206ax/model_206ax_init.c b/src/cpu/intel/model_206ax/model_206ax_init.c index dda7d354b7..87bc585d86 100644 --- a/src/cpu/intel/model_206ax/model_206ax_init.c +++ b/src/cpu/intel/model_206ax/model_206ax_init.c @@ -115,9 +115,11 @@ static acpi_cstate_t cstate_map[] = { { 0 } }; +#if !CONFIG_MICROCODE_IN_CBFS static const uint32_t microcode_updates[] = { #include "microcode_blob.h" }; +#endif /* Convert time in seconds to POWER_LIMIT_1_TIME MSR value */ static const u8 power_limit_time_sec_to_msr[] = { @@ -387,8 +389,11 @@ static void model_206ax_init(device_t cpu) /* Turn on caching if we haven't already */ x86_enable_cache(); - /* Update the microcode */ +#if CONFIG_MICROCODE_IN_CBFS + intel_update_microcode_from_cbfs(); +#else intel_update_microcode(microcode_updates); +#endif /* Clear out pending MCEs */ configure_mca(); diff --git a/src/include/cpu/intel/microcode.h b/src/include/cpu/intel/microcode.h index 4139c01e82..289e9196fa 100644 --- a/src/include/cpu/intel/microcode.h +++ b/src/include/cpu/intel/microcode.h @@ -1,6 +1,7 @@ /* * This file is part of the coreboot project. * + * Copyright (C) 2012 The ChromiumOS Authors. All rights reserved. * Copyright (C) 2000 Ronald G. Minnich * * This program is free software; you can redistribute it and/or modify @@ -16,7 +17,15 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef __CPU__INTEL__MICROCODE__ +#define __CPU__INTEL__MICROCODE__ -#if !defined(__ROMCC__) +#ifndef __PRE_RAM__ +#if CONFIG_MICROCODE_IN_CBFS +void intel_update_microcode_from_cbfs(void); +#else void intel_update_microcode(const void *microcode_updates); #endif +#endif + +#endif |