diff --git a/src/soc/amd/cezanne/include/soc/cpu.h b/src/soc/amd/cezanne/include/soc/cpu.h
index 926fd05..0239e19 100644
--- a/src/soc/amd/cezanne/include/soc/cpu.h
+++ b/src/soc/amd/cezanne/include/soc/cpu.h
@@ -3,7 +3,7 @@
 #ifndef AMD_CEZANNE_CPU_H
 #define AMD_CEZANNE_CPU_H
 
-#define CEZANNE_A0_CPUID	0x00a50f00
+#define CEZANNE_A0_CPUID	CPUID_FROM_FMS(0x19, 0x50, 0)
 
 #define CEZANNE_VBIOS_VID_DID	0x10021638
 #define BARCELO_VBIOS_VID_DID	0x100215e7
diff --git a/src/soc/amd/glinda/include/soc/cpu.h b/src/soc/amd/glinda/include/soc/cpu.h
index 42b76c8..e7207da 100644
--- a/src/soc/amd/glinda/include/soc/cpu.h
+++ b/src/soc/amd/glinda/include/soc/cpu.h
@@ -3,6 +3,6 @@
 #ifndef AMD_GLINDA_CPU_H
 #define AMD_GLINDA_CPU_H
 
-#define GLINDA_A0_CPUID	0x008a0f00 /* TODO: Update for Glinda */
+#define GLINDA_A0_CPUID	CPUID_FROM_FMS(0x17, 0xa0, 0) /* TODO: Update for Glinda */
 
 #endif /* AMD_GLINDA_CPU_H */
diff --git a/src/soc/amd/mendocino/include/soc/cpu.h b/src/soc/amd/mendocino/include/soc/cpu.h
index e0202bb..1890306 100644
--- a/src/soc/amd/mendocino/include/soc/cpu.h
+++ b/src/soc/amd/mendocino/include/soc/cpu.h
@@ -3,6 +3,6 @@
 #ifndef AMD_MENDOCINO_CPU_H
 #define AMD_MENDOCINO_CPU_H
 
-#define MENDOCINO_A0_CPUID	0x008a0f00
+#define MENDOCINO_A0_CPUID	CPUID_FROM_FMS(0x17, 0xa0, 0)
 
 #endif /* AMD_MENDOCINO_CPU_H */
diff --git a/src/soc/amd/phoenix/include/soc/cpu.h b/src/soc/amd/phoenix/include/soc/cpu.h
index 34784c4..19e7a95 100644
--- a/src/soc/amd/phoenix/include/soc/cpu.h
+++ b/src/soc/amd/phoenix/include/soc/cpu.h
@@ -3,7 +3,7 @@
 #ifndef AMD_PHOENIX_CPU_H
 #define AMD_PHOENIX_CPU_H
 
-#define PHOENIX_A0_CPUID	0x00a70f40
-#define PHOENIX2_A0_CPUID	0x00a70f80
+#define PHOENIX_A0_CPUID	CPUID_FROM_FMS(0x19, 0x74, 0)
+#define PHOENIX2_A0_CPUID	CPUID_FROM_FMS(0x19, 0x78, 0)
 
 #endif /* AMD_PHOENIX_CPU_H */
diff --git a/src/soc/amd/stoneyridge/cpu.c b/src/soc/amd/stoneyridge/cpu.c
index 5ecf0c6..25549d0 100644
--- a/src/soc/amd/stoneyridge/cpu.c
+++ b/src/soc/amd/stoneyridge/cpu.c
@@ -60,8 +60,8 @@
 };
 
 static struct cpu_device_id cpu_table[] = {
-	{ X86_VENDOR_AMD, 0x660f00, CPUID_ALL_STEPPINGS_MASK },
-	{ X86_VENDOR_AMD, 0x670f00, CPUID_ALL_STEPPINGS_MASK },
+	{ X86_VENDOR_AMD, CPUID_FROM_FMS(0x15, 0x60, 0), CPUID_ALL_STEPPINGS_MASK },
+	{ X86_VENDOR_AMD, CPUID_FROM_FMS(0x15, 0x70, 0), CPUID_ALL_STEPPINGS_MASK },
 	{ 0, 0, 0 },
 };