summaryrefslogtreecommitdiff
path: root/src/soc/intel/common/block
diff options
context:
space:
mode:
authorPatrick Rudolph <patrick.rudolph@9elements.com>2021-01-25 09:42:08 +0100
committerPatrick Georgi <pgeorgi@google.com>2021-02-01 08:46:30 +0000
commit3fa23b8c008709e4204992c52fcd5b729454b333 (patch)
tree9e37e3f51c4a4c375a3cf497db1db5663f39fe28 /src/soc/intel/common/block
parent7aaea37e3756803450201bcd9ef202aa4ddc3c02 (diff)
soc/intel/*: Get rid of custom microcode caching
Get rid of custom microcode caching in MPinit and SGX code and use the caching introduced in intel_microcode_find() instead. Change-Id: If3ccd4dcff221c88839ffeafa812f4c38cede63f Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/49897 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'src/soc/intel/common/block')
-rw-r--r--src/soc/intel/common/block/cpu/mp_init.c19
-rw-r--r--src/soc/intel/common/block/include/intelblocks/mp_init.h8
-rw-r--r--src/soc/intel/common/block/sgx/sgx.c2
3 files changed, 5 insertions, 24 deletions
diff --git a/src/soc/intel/common/block/cpu/mp_init.c b/src/soc/intel/common/block/cpu/mp_init.c
index 4fd2074343..8f8cd069b3 100644
--- a/src/soc/intel/common/block/cpu/mp_init.c
+++ b/src/soc/intel/common/block/cpu/mp_init.c
@@ -15,8 +15,6 @@
#include <intelblocks/msr.h>
#include <soc/cpu.h>
-static const void *microcode_patch;
-
/* SoC override function */
__weak void soc_core_init(struct device *dev)
{
@@ -31,6 +29,8 @@ __weak void soc_init_cpus(struct bus *cpu_bus)
static void init_one_cpu(struct device *dev)
{
soc_core_init(dev);
+
+ const void *microcode_patch = intel_microcode_find();
intel_microcode_load_unlocked(microcode_patch);
}
@@ -105,17 +105,6 @@ int get_cpu_count(void)
}
/*
- * Function to get the microcode patch pointer. Use this function to avoid
- * reading the microcode patch from the boot media. init_cpus() would
- * initialize microcode_patch global variable to point to microcode patch
- * in boot media and this function can be used to access the pointer.
- */
-const void *intel_mp_current_microcode(void)
-{
- return microcode_patch;
-}
-
-/*
* MP Init callback function(get_microcode_info) to find the Microcode at
* Pre MP Init phase. This function is common among all SOCs and thus its in
* Common CPU block.
@@ -125,7 +114,7 @@ const void *intel_mp_current_microcode(void)
*/
void get_microcode_info(const void **microcode, int *parallel)
{
- *microcode = intel_mp_current_microcode();
+ *microcode = intel_microcode_find();
*parallel = 1;
}
@@ -151,7 +140,7 @@ static void coreboot_init_cpus(void *unused)
if (CONFIG(USE_INTEL_FSP_MP_INIT))
return;
- microcode_patch = intel_microcode_find();
+ const void *microcode_patch = intel_microcode_find();
intel_microcode_load_unlocked(microcode_patch);
init_cpus();
diff --git a/src/soc/intel/common/block/include/intelblocks/mp_init.h b/src/soc/intel/common/block/include/intelblocks/mp_init.h
index 7dc85df24e..9038dd5823 100644
--- a/src/soc/intel/common/block/include/intelblocks/mp_init.h
+++ b/src/soc/intel/common/block/include/intelblocks/mp_init.h
@@ -54,14 +54,6 @@
int get_cpu_count(void);
/*
- * Function to get the microcode patch pointer. Use this function to avoid
- * reading the microcode patch from the boot media. init_cpus() would
- * initialize microcode_patch global variable to point to microcode patch
- * in boot media and this function can be used to access the pointer.
- */
-const void *intel_mp_current_microcode(void);
-
-/*
* MP Init callback function(get_microcode_info) to find the Microcode at
* Pre MP Init phase. This function is common among all SOCs and thus its in
* Common CPU block.
diff --git a/src/soc/intel/common/block/sgx/sgx.c b/src/soc/intel/common/block/sgx/sgx.c
index 336ed54f06..b5c8944a9b 100644
--- a/src/soc/intel/common/block/sgx/sgx.c
+++ b/src/soc/intel/common/block/sgx/sgx.c
@@ -224,7 +224,7 @@ void sgx_configure(void *unused)
* loads and to prevent simultaneous load attempts to the same core.
*/
if (!intel_ht_sibling()) {
- const void *microcode_patch = intel_mp_current_microcode();
+ const void *microcode_patch = intel_microcode_find();
intel_microcode_load_unlocked(microcode_patch);
}