diff --git a/src/soc/amd/common/block/cpu/mca/mca.c b/src/soc/amd/common/block/cpu/mca/mca.c
index 2d91894491..b5fd6a29df 100644
--- a/src/soc/amd/common/block/cpu/mca/mca.c
+++ b/src/soc/amd/common/block/cpu/mca/mca.c
@@ -33,6 +33,9 @@ void mca_check_all_banks(void)
 	struct mca_bank_status mci;
 	const unsigned int num_banks = mca_get_bank_count();
 
+	if (!mca_has_expected_bank_count())
+		printk(BIOS_WARNING, "CPU has an unexpected number of MCA banks!\n");
+
 	if (!is_warm_reset())
 		return;
 
diff --git a/src/soc/amd/stoneyridge/mca.c b/src/soc/amd/stoneyridge/mca.c
index 240e75db31..7ca16a8d43 100644
--- a/src/soc/amd/stoneyridge/mca.c
+++ b/src/soc/amd/stoneyridge/mca.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <amdblocks/mca.h>
+#include <cpu/x86/msr.h>
 #include <types.h>
 
 static const char *const mca_bank_name[] = {
@@ -15,6 +16,11 @@ static const char *const mca_bank_name[] = {
 	[6] = "Floating point unit"
 };
 
+bool mca_has_expected_bank_count(void)
+{
+	return ARRAY_SIZE(mca_bank_name) == mca_get_bank_count();
+}
+
 bool mca_is_valid_bank(unsigned int bank)
 {
 	return (bank < ARRAY_SIZE(mca_bank_name) && mca_bank_name[bank] != NULL);