diff --git a/src/soc/amd/picasso/mca.c b/src/soc/amd/picasso/mca.c
index 16471b9ea7..0fd2d17cb5 100644
--- a/src/soc/amd/picasso/mca.c
+++ b/src/soc/amd/picasso/mca.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <amdblocks/msr_zen.h>
 #include <amdblocks/reset.h>
 #include <cpu/x86/msr.h>
 #include <acpi/acpi.h>
@@ -121,8 +122,7 @@ static void build_bert_mca_error(struct mca_bank *mci)
 					IA32_MC0_CTL + (mci->bank * 4), 4);
 	if (!ctx)
 		goto failed;
-	ctx = cper_new_ia32x64_context_msr(status, x86_sec,
-					MC0_CTL_MASK + mci->bank, 1);
+	ctx = cper_new_ia32x64_context_msr(status, x86_sec, MCA_CTL_MASK_MSR(mci->bank), 1);
 	if (!ctx)
 		goto failed;
 
@@ -176,7 +176,7 @@ void check_mca(void)
 				mci.ctl = rdmsr(IA32_MC0_CTL + (i * 4));
 				printk(BIOS_WARNING, "   MC%d_CTL =      %08x_%08x\n",
 						i, mci.ctl.hi, mci.ctl.lo);
-				mci.cmask = rdmsr(MC0_CTL_MASK + i);
+				mci.cmask = rdmsr(MCA_CTL_MASK_MSR(i));
 				printk(BIOS_WARNING, "   MC%d_CTL_MASK = %08x_%08x\n",
 						i, mci.cmask.hi, mci.cmask.lo);