summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cpu/x86/mp_init.c2
-rw-r--r--src/soc/amd/common/block/pi/def_callouts.c8
-rw-r--r--src/soc/intel/skylake/cpu.c11
3 files changed, 13 insertions, 8 deletions
diff --git a/src/cpu/x86/mp_init.c b/src/cpu/x86/mp_init.c
index 9528149627..dbaf73fdfb 100644
--- a/src/cpu/x86/mp_init.c
+++ b/src/cpu/x86/mp_init.c
@@ -910,7 +910,7 @@ static int run_ap_work(struct mp_callback *val, long expire_us)
return 0;
} while (expire_us <= 0 || !stopwatch_expired(&sw));
- printk(BIOS_ERR, "AP call expired. %d/%d CPUs accepted.\n",
+ printk(BIOS_CRIT, "CIRTICAL ERROR: AP call expired. %d/%d CPUs accepted.\n",
cpus_accepted, global_num_aps);
return -1;
}
diff --git a/src/soc/amd/common/block/pi/def_callouts.c b/src/soc/amd/common/block/pi/def_callouts.c
index 6734b55fde..299a98abe9 100644
--- a/src/soc/amd/common/block/pi/def_callouts.c
+++ b/src/soc/amd/common/block/pi/def_callouts.c
@@ -220,8 +220,8 @@ AGESA_STATUS agesa_RunFuncOnAp(uint32_t Func, uintptr_t Data, void *ConfigPtr)
agesadata.Func = Func;
agesadata.Data = Data;
agesadata.ConfigPtr = ConfigPtr;
- mp_run_on_aps(callout_ap_entry, NULL, MP_RUN_ON_ALL_CPUS,
- 100 * USECS_PER_MSEC);
+ if (mp_run_on_aps(callout_ap_entry, NULL, MP_RUN_ON_ALL_CPUS, 100 * USECS_PER_MSEC))
+ return AGESA_ERROR;
return AGESA_SUCCESS;
}
@@ -234,8 +234,8 @@ AGESA_STATUS agesa_RunFcnOnAllAps(uint32_t Func, uintptr_t Data,
agesadata.Func = Func;
agesadata.Data = Data;
agesadata.ConfigPtr = ConfigPtr;
- mp_run_on_aps(callout_ap_entry, NULL, MP_RUN_ON_ALL_CPUS,
- 100 * USECS_PER_MSEC);
+ if (mp_run_on_aps(callout_ap_entry, NULL, MP_RUN_ON_ALL_CPUS, 100 * USECS_PER_MSEC))
+ return AGESA_ERROR;
return AGESA_SUCCESS;
}
diff --git a/src/soc/intel/skylake/cpu.c b/src/soc/intel/skylake/cpu.c
index cb0ceaa0bc..eecb0048b9 100644
--- a/src/soc/intel/skylake/cpu.c
+++ b/src/soc/intel/skylake/cpu.c
@@ -476,6 +476,8 @@ static void fc_lock_configure(void *unused)
static void post_mp_init(void)
{
+ int ret = 0;
+
/* Set Max Ratio */
cpu_set_max_ratio();
@@ -489,11 +491,14 @@ static void post_mp_init(void)
if (CONFIG(HAVE_SMI_HANDLER))
smm_lock();
- mp_run_on_all_cpus(vmx_configure, NULL, 2 * USECS_PER_MSEC);
+ ret |= mp_run_on_all_cpus(vmx_configure, NULL, 2 * USECS_PER_MSEC);
+
+ ret |= mp_run_on_all_cpus(sgx_configure, NULL, 14 * USECS_PER_MSEC);
- mp_run_on_all_cpus(sgx_configure, NULL, 14 * USECS_PER_MSEC);
+ ret |= mp_run_on_all_cpus(fc_lock_configure, NULL, 2 * USECS_PER_MSEC);
- mp_run_on_all_cpus(fc_lock_configure, NULL, 2 * USECS_PER_MSEC);
+ if (ret)
+ printk(BIOS_CRIT, "CRITICAL ERROR: MP post init failed\n");
}
static const struct mp_ops mp_ops = {