3 files changed, 33 insertions, 0 deletions
diff --git a/src/soc/amd/common/block/cpu/Kconfig b/src/soc/amd/common/block/cpu/Kconfig
index 1437326f9d..79e011fadd 100644
--- a/src/soc/amd/common/block/cpu/Kconfig
+++ b/src/soc/amd/common/block/cpu/Kconfig
@@ -26,6 +26,26 @@ config MEMLAYOUT_LD_FILE
 
 endif # SOC_AMD_COMMON_BLOCK_NONCAR
 
+config SOC_AMD_COMMON_BLOCK_MCA_COMMON
+	bool
+	help
+	  Add common machine check architecture support. Do not select this
+	  in the SoC's Kconfig; select either SOC_AMD_COMMON_BLOCK_MCA or
+	  SOC_AMD_COMMON_BLOCK_MCAX which will select this one.
+
+config SOC_AMD_COMMON_BLOCK_MCA
+	bool
+	select SOC_AMD_COMMON_BLOCK_MCA_COMMON
+	help
+	  Add IA32 machine check architecture (MCA) support for pre-Zen CPUs.
+
+config SOC_AMD_COMMON_BLOCK_MCAX
+	bool
+	select SOC_AMD_COMMON_BLOCK_MCA_COMMON
+	help
+	  Add extended machine check architecture (MCAX) support for AMD family
+	  17h, 19h and possibly newer CPUs.
+
 config SOC_AMD_COMMON_BLOCK_SMM
 	bool
 	help
diff --git a/src/soc/amd/common/block/cpu/mca/Makefile.inc b/src/soc/amd/common/block/cpu/mca/Makefile.inc
new file mode 100644
index 0000000000..0aa47e161c
--- /dev/null
+++ b/src/soc/amd/common/block/cpu/mca/Makefile.inc
@@ -0,0 +1 @@
+ramstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_MCA_COMMON) += mca_common.c
diff --git a/src/soc/amd/common/block/cpu/mca/mca_common.c b/src/soc/amd/common/block/cpu/mca/mca_common.c
new file mode 100644
index 0000000000..0a375089f2
--- /dev/null
+++ b/src/soc/amd/common/block/cpu/mca/mca_common.c
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <amdblocks/mca.h>
+#include <cpu/x86/msr.h>
+
+void check_mca(void)
+{
+	mca_check_all_banks();
+	/* mca_clear_status uses the MCA registers which can be used in both the MCA and MCAX
+	  case */
+	mca_clear_status();
+}