From d7a8cec0615fede43c642b98bd402e1542b4997b Mon Sep 17 00:00:00 2001 From: Barnali Sarkar Date: Wed, 7 Jun 2017 13:47:51 +0530 Subject: [PATCH] UPSTREAM: soc/intel/apollolake: Remove duplication of find_microcode_patch() code Since get_microcode_info() is aleady searching for the microcode in cbfs, we can just add a intel_microcode_load_unlocked() call here to update the microcode. No need to duplicate finding microcode step during pre_mp_init() function. BUG=none BRANCH=none TEST=none Change-Id: Id9bb31b2b02dd92dadb76cbd37bf1f5e01b64117 Signed-off-by: Patrick Georgi Original-Commit-Id: 97daf988060f0b73b889a78983718f679753ffbd Original-Change-Id: I525cab0ecc7826554f0a1209862e6357d1c7a9a6 Original-Signed-off-by: Barnali Sarkar Original-Reviewed-on: https://review.coreboot.org/20088 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Aaron Durbin Original-Reviewed-by: Furquan Shaikh Original-Reviewed-by: Subrata Banik Reviewed-on: https://chromium-review.googlesource.com/531704 Commit-Ready: Patrick Georgi Tested-by: Patrick Georgi Reviewed-by: Patrick Georgi --- src/soc/intel/apollolake/cpu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/soc/intel/apollolake/cpu.c b/src/soc/intel/apollolake/cpu.c index 9e951aa57d..1a9c8db995 100644 --- a/src/soc/intel/apollolake/cpu.c +++ b/src/soc/intel/apollolake/cpu.c @@ -118,9 +118,6 @@ static void pre_mp_init(void) { x86_setup_mtrrs_with_detect(); x86_mtrr_check(); - - /* Make sure BSP is using the microcode from cbfs */ - intel_update_microcode_from_cbfs(); } /* Find CPU topology */ @@ -140,6 +137,9 @@ static void get_microcode_info(const void **microcode, int *parallel) { *microcode = intel_microcode_find(); *parallel = 1; + + /* Make sure BSP is using the microcode from cbfs */ + intel_microcode_load_unlocked(*microcode); } static void get_smm_info(uintptr_t *perm_smbase, size_t *perm_smsize,