diff --git a/src/soc/intel/common/block/cpu/cpulib.c b/src/soc/intel/common/block/cpu/cpulib.c
index 9e95b0f9f4..a245824821 100644
--- a/src/soc/intel/common/block/cpu/cpulib.c
+++ b/src/soc/intel/common/block/cpu/cpulib.c
@@ -338,12 +338,10 @@ void mca_configure(void)
 {
 	msr_t msr;
 	int i;
-	int num_banks;
+	const unsigned int num_banks = mca_get_bank_count();
 
 	printk(BIOS_DEBUG, "Clearing out pending MCEs\n");
 
-	msr = rdmsr(IA32_MCG_CAP);
-	num_banks = msr.lo & 0xff;
 	msr.lo = msr.hi = 0;
 
 	for (i = 0; i < num_banks; i++) {