summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPratik Prajapati <pratikkumar.v.prajapati@intel.com>2017-08-28 12:28:24 -0700
committerMartin Roth <martinroth@google.com>2017-09-02 15:20:20 +0000
commit2ad1ddb3903b1057d16c72631f10b4a1f1934bb8 (patch)
treed80ce602ad0e5e90c94a17c633dbd6f11729fb2b
parente816315ee295d5404fff041e59c53bf78f20cdf0 (diff)
downloadcoreboot-2ad1ddb3903b1057d16c72631f10b4a1f1934bb8.tar.xz
soc/intel/cannonlake: Use common mca_configure() API
Use mca_configure() API from cpulib to configure Intel Machine Check Architecture (MCA) Change-Id: Ib4943a7f7929775bd5e9945462e530ef68a398b8 Signed-off-by: Pratik Prajapati <pratikkumar.v.prajapati@intel.com> Reviewed-on: https://review.coreboot.org/21241 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Lijian Zhao <lijian.zhao@intel.com> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
-rw-r--r--src/soc/intel/cannonlake/cpu.c28
1 files changed, 4 insertions, 24 deletions
diff --git a/src/soc/intel/cannonlake/cpu.c b/src/soc/intel/cannonlake/cpu.c
index ec979f0cd4..2faadfd492 100644
--- a/src/soc/intel/cannonlake/cpu.c
+++ b/src/soc/intel/cannonlake/cpu.c
@@ -129,29 +129,6 @@ static void set_energy_perf_bias(u8 policy)
wrmsr(IA32_ENERGY_PERFORMANCE_BIAS, msr);
}
-static void configure_mca(void)
-{
- msr_t msr;
- int i;
- int num_banks;
-
- msr = rdmsr(IA32_MCG_CAP);
- num_banks = msr.lo & 0xff;
- msr.lo = msr.hi = 0;
- /*
- * 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
- * every bank.
- */
- for (i = 0; i < num_banks; i++) {
- /* Clear the machine check status */
- wrmsr(IA32_MC0_STATUS + (i * 4), msr);
- /* Initialize machine checks */
- wrmsr(IA32_MC0_CTL + i * 4,
- (msr_t) {.lo = 0xffffffff, .hi = 0xffffffff});
- }
-}
-
static void configure_c_states(void)
{
msr_t msr;
@@ -194,7 +171,10 @@ static void configure_c_states(void)
void soc_core_init(device_t cpu)
{
/* Clear out pending MCEs */
- configure_mca();
+ /* 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
+ * every bank. */
+ mca_configure();
/* Enable the local CPU apics */
enable_lapic_tpr();