diff --git a/src/soc/amd/stoneyridge/cpu.c b/src/soc/amd/stoneyridge/cpu.c
index c898ff7f93..9992fc54aa 100644
--- a/src/soc/amd/stoneyridge/cpu.c
+++ b/src/soc/amd/stoneyridge/cpu.c
@@ -16,6 +16,7 @@
 #include <soc/smi.h>
 #include <soc/iomap.h>
 #include <console/console.h>
+#include <amdblocks/psp.h>
 
 /*
  * MP and SMM loading initialization.
@@ -121,10 +122,10 @@ static void model_15_init(struct device *dev)
 	uint32_t psp_bar; /* Note: NDA BKDG names this 32-bit register BAR3 */
 	psp_bar = pci_read_config32(SOC_PSP_DEV, PCI_BASE_ADDRESS_4);
 	psp_bar &= ~PCI_BASE_ADDRESS_MEM_ATTR_MASK;
-	psp_msr = rdmsr(0xc00110a2);
+	psp_msr = rdmsr(MSR_PSP_ADDR);
 	if (psp_msr.lo == 0) {
 		psp_msr.lo = psp_bar;
-		wrmsr(0xc00110a2, psp_msr);
+		wrmsr(MSR_PSP_ADDR, psp_msr);
 	}
 }