summaryrefslogtreecommitdiff
path: root/src/cpu/intel/model_65x
diff options
context:
space:
mode:
authorAlexandru Gagniuc <mr.nuke.me@gmail.com>2013-12-06 23:14:54 -0600
committerAlexandru Gagniuc <mr.nuke.me@gmail.com>2014-01-16 05:34:25 +0100
commit2c38f50b4ad8850676a70427bf1e2e9e9aab82a4 (patch)
tree68fe15f5e270e69ab9810b12fa2bf61d7ff71585 /src/cpu/intel/model_65x
parentb4c39902edbba61827c60a75fe84e748e217b8be (diff)
downloadcoreboot-2c38f50b4ad8850676a70427bf1e2e9e9aab82a4.tar.xz
cpu/intel: Make all Intel CPUs load microcode from CBFS
The sequence to inject microcode updates is virtually the same for all Intel CPUs. The same function is used to inject the update in both CBFS and hardcoded cases, and in both of these cases, the microcode resides in the ROM. This should be a safe change across the board. The function which loaded compiled-in microcode is also removed here in order to prevent it from being used in the future. The dummy terminators from microcode need to be removed if this change is to work when generating microcode from several microcode_blob.c files, as is the case for older socketed CPUs. Removal of dummy terminators is done in a subsequent patch. Change-Id: I2cc8220cc4cd4a87aa7fc750e6c60ccdfa9986e9 Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> Reviewed-on: http://review.coreboot.org/4495 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@gmail.com>
Diffstat (limited to 'src/cpu/intel/model_65x')
-rw-r--r--src/cpu/intel/model_65x/Kconfig1
-rw-r--r--src/cpu/intel/model_65x/Makefile.inc1
-rw-r--r--src/cpu/intel/model_65x/microcode_blob.c25
-rw-r--r--src/cpu/intel/model_65x/model_65x_init.c29
4 files changed, 28 insertions, 28 deletions
diff --git a/src/cpu/intel/model_65x/Kconfig b/src/cpu/intel/model_65x/Kconfig
index 1ef48139f6..e8f0767ce4 100644
--- a/src/cpu/intel/model_65x/Kconfig
+++ b/src/cpu/intel/model_65x/Kconfig
@@ -1,3 +1,4 @@
config CPU_INTEL_MODEL_65X
bool
select SMP
+ select SUPPORT_CPU_UCODE_IN_CBFS
diff --git a/src/cpu/intel/model_65x/Makefile.inc b/src/cpu/intel/model_65x/Makefile.inc
index 50639e71b8..9298037877 100644
--- a/src/cpu/intel/model_65x/Makefile.inc
+++ b/src/cpu/intel/model_65x/Makefile.inc
@@ -20,3 +20,4 @@
ramstage-y += model_65x_init.c
+cpu_microcode-$(CONFIG_CPU_MICROCODE_CBFS_GENERATE) += microcode_blob.c
diff --git a/src/cpu/intel/model_65x/microcode_blob.c b/src/cpu/intel/model_65x/microcode_blob.c
new file mode 100644
index 0000000000..f14f317743
--- /dev/null
+++ b/src/cpu/intel/model_65x/microcode_blob.c
@@ -0,0 +1,25 @@
+unsigned microcode_updates_65x[] = {
+ #include "microcode-410-MU16522d.h"
+ #include "microcode-422-MU26530b.h"
+ #include "microcode-412-MU16530d.h"
+ #include "microcode-423-MU26522b.h"
+ #include "microcode-407-MU16522a.h"
+ #include "microcode-146-MU16502e.h"
+ #include "microcode-409-MU16522c.h"
+ #include "microcode-147-MU16502f.h"
+ #include "microcode-94-MU265019.h"
+ #include "microcode-430-MU165041.h"
+ #include "microcode-452-MU165310.h"
+ #include "microcode-434-MU165140.h"
+ #include "microcode-435-MU165141.h"
+ #include "microcode-433-MU165045.h"
+ #include "microcode-429-MU165040.h"
+ #include "microcode-436-MU165142.h"
+ #include "microcode-411-MU16530c.h"
+
+ /* Dummy terminator */
+ 0x0, 0x0, 0x0, 0x0,
+ 0x0, 0x0, 0x0, 0x0,
+ 0x0, 0x0, 0x0, 0x0,
+ 0x0, 0x0, 0x0, 0x0,
+};
diff --git a/src/cpu/intel/model_65x/model_65x_init.c b/src/cpu/intel/model_65x/model_65x_init.c
index 285bacd94b..69141221eb 100644
--- a/src/cpu/intel/model_65x/model_65x_init.c
+++ b/src/cpu/intel/model_65x/model_65x_init.c
@@ -29,37 +29,10 @@
#include <cpu/x86/cache.h>
#include <cpu/intel/l2_cache.h>
-static u32 microcode_updates[] = {
- #include "microcode-410-MU16522d.h"
- #include "microcode-422-MU26530b.h"
- #include "microcode-412-MU16530d.h"
- #include "microcode-423-MU26522b.h"
- #include "microcode-407-MU16522a.h"
- #include "microcode-146-MU16502e.h"
- #include "microcode-409-MU16522c.h"
- #include "microcode-147-MU16502f.h"
- #include "microcode-94-MU265019.h"
- #include "microcode-430-MU165041.h"
- #include "microcode-452-MU165310.h"
- #include "microcode-434-MU165140.h"
- #include "microcode-435-MU165141.h"
- #include "microcode-433-MU165045.h"
- #include "microcode-429-MU165040.h"
- #include "microcode-436-MU165142.h"
- #include "microcode-411-MU16530c.h"
-
- /* Dummy terminator */
- 0x0, 0x0, 0x0, 0x0,
- 0x0, 0x0, 0x0, 0x0,
- 0x0, 0x0, 0x0, 0x0,
- 0x0, 0x0, 0x0, 0x0,
-};
-
static void model_65x_init(device_t dev)
{
/* Update the microcode */
- intel_update_microcode(microcode_updates);
-
+ intel_update_microcode_from_cbfs();
/* Initialize L2 cache */
p6_configure_l2_cache();