soc/intel/*: Move prmrr_core_configure
Move prmrr_core_configure before clearing MCEs.
This is required for the following patch in order to update microcode
after PRMRR has been configured, but before MCEs have been cleared.
According to Document 565432 this should be no issue in regards to
SGX activation.
Change-Id: Id2808a3989adff493aaf4175cbeccd080efaaedf
Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49898
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
diff --git a/src/soc/intel/apollolake/cpu.c b/src/soc/intel/apollolake/cpu.c
index a071337..f2b14d7 100644
--- a/src/soc/intel/apollolake/cpu.c
+++ b/src/soc/intel/apollolake/cpu.c
@@ -48,6 +48,10 @@
void soc_core_init(struct device *cpu)
{
+ /* Configure Core PRMRR for SGX. */
+ if (CONFIG(SOC_INTEL_COMMON_BLOCK_SGX_ENABLE))
+ prmrr_core_configure();
+
/* Clear out pending MCEs */
/* TODO(adurbin): Some of these banks are core vs package
scope. For now every CPU clears every bank. */
@@ -66,10 +70,6 @@
*/
enable_pm_timer_emulation();
- /* Configure Core PRMRR for SGX. */
- if (CONFIG(SOC_INTEL_COMMON_BLOCK_SGX_ENABLE))
- prmrr_core_configure();
-
/* Set Max Non-Turbo ratio if RAPL is disabled. */
if (CONFIG(APL_SKIP_SET_POWER_LIMITS)) {
cpu_set_p_state_to_max_non_turbo_ratio();
diff --git a/src/soc/intel/skylake/cpu.c b/src/soc/intel/skylake/cpu.c
index 1647db4..307c849 100644
--- a/src/soc/intel/skylake/cpu.c
+++ b/src/soc/intel/skylake/cpu.c
@@ -97,6 +97,10 @@
/* All CPUs including BSP will run the following function. */
void soc_core_init(struct device *cpu)
{
+ /* Configure Core PRMRR for SGX. */
+ if (CONFIG(SOC_INTEL_COMMON_BLOCK_SGX_ENABLE))
+ prmrr_core_configure();
+
/* Clear out pending MCEs */
/* TODO(adurbin): This should only be done on a cold boot. Also, some
* of these banks are core vs package scope. For now every CPU clears
@@ -126,10 +130,6 @@
/* Enable Turbo */
enable_turbo();
-
- /* Configure Core PRMRR for SGX. */
- if (CONFIG(SOC_INTEL_COMMON_BLOCK_SGX_ENABLE))
- prmrr_core_configure();
}
static void per_cpu_smm_trigger(void)