From 8995c3e42372db22ad9bffd0dfe459645c3ab02a Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Sat, 6 May 2017 13:01:32 -0700 Subject: [PATCH] UPSTREAM: soc/intel/skylake: Enable MTRR check Change a4b11e5c90 (soc/intel/skylake: Perform CPU MP Init before FSP-S Init) dropped mtrr_check while re-organizing code. Add the check back after MTRR setup is performed. BUG=b:36656098 TEST=Verified that MTRR check is done after setup on poppy. Change-Id: If2f00fa65c716036bd5da37b9ba150460350cfbc Signed-off-by: Patrick Georgi Original-Commit-Id: e411f8eb72e3674d82f03fceaca27af4e64a9aaf Original-Change-Id: I440405c58c470ffa338be386d84870635530a031 Original-Signed-off-by: Furquan Shaikh Original-Reviewed-on: https://review.coreboot.org/19609 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Philippe Mathieu-Daud Original-Reviewed-by: Paul Menzel Original-Reviewed-by: Aaron Durbin Reviewed-on: https://chromium-review.googlesource.com/501153 --- src/soc/intel/skylake/cpu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/soc/intel/skylake/cpu.c b/src/soc/intel/skylake/cpu.c index 0b1b9af6ce..2f356355b0 100644 --- a/src/soc/intel/skylake/cpu.c +++ b/src/soc/intel/skylake/cpu.c @@ -523,6 +523,7 @@ static void soc_post_cpus_init(void *unused) { if (mp_run_on_all_cpus(&x86_setup_mtrrs_with_detect, 1000) < 0) printk(BIOS_ERR, "MTRR programming failure\n"); + x86_mtrr_check(); } int soc_skip_ucode_update(u32 current_patch_id, u32 new_patch_id)