diff --git a/src/include/cpu/x86/smm.h b/src/include/cpu/x86/smm.h
index 379b512e93..857ab356cb 100644
--- a/src/include/cpu/x86/smm.h
+++ b/src/include/cpu/x86/smm.h
@@ -473,6 +473,7 @@ typedef struct {
 #define APM_CNT_GNVS_UPDATE	0xea
 #define APM_CNT_FINALIZE	0xcb
 #define APM_CNT_LEGACY		0xcc
+#define APM_CNT_ELOG_GSMI	0xef
 #define APM_STS		0xb3
 
 /* SMI handler function prototypes */
diff --git a/src/include/elog.h b/src/include/elog.h
index 8aecf2c29b..31891e01ec 100644
--- a/src/include/elog.h
+++ b/src/include/elog.h
@@ -16,9 +16,6 @@
 #ifndef ELOG_H_
 #define ELOG_H_
 
-/* SMI command code for GSMI event logging */
-#define ELOG_GSMI_APM_CNT                 0xEF
-
 #define MAX_EVENT_SIZE                    0x7F
 
 /* End of log */
diff --git a/src/soc/amd/stoneyridge/smihandler.c b/src/soc/amd/stoneyridge/smihandler.c
index a5e66a88d2..a662bc5d37 100644
--- a/src/soc/amd/stoneyridge/smihandler.c
+++ b/src/soc/amd/stoneyridge/smihandler.c
@@ -72,7 +72,7 @@ static void southbridge_smi_gsmi(void)
 	amd64_smm_state_save_area_t *io_smi;
 	u32 reg_ebx;
 
-	io_smi = find_save_state(ELOG_GSMI_APM_CNT);
+	io_smi = find_save_state(APM_CNT_ELOG_GSMI);
 	if (!io_smi)
 		return;
 	/* Command and return value in EAX */
@@ -101,7 +101,7 @@ static void sb_apmc_smi_handler(void)
 		reg32 &= ~(1 << 0);	/* clear SCI_EN */
 		acpi_write32(MMIO_ACPI_PM1_CNT_BLK, reg32);
 		break;
-	case ELOG_GSMI_APM_CNT:
+	case APM_CNT_ELOG_GSMI:
 		if (IS_ENABLED(CONFIG_ELOG_GSMI))
 			southbridge_smi_gsmi();
 		break;
diff --git a/src/soc/intel/baytrail/smihandler.c b/src/soc/intel/baytrail/smihandler.c
index c2227394b0..3f8727def8 100644
--- a/src/soc/intel/baytrail/smihandler.c
+++ b/src/soc/intel/baytrail/smihandler.c
@@ -214,7 +214,7 @@ static void southbridge_smi_gsmi(void)
 	u32 *ret, *param;
 	uint8_t sub_command;
 	em64t100_smm_state_save_area_t *io_smi =
-		smi_apmc_find_state_save(ELOG_GSMI_APM_CNT);
+		smi_apmc_find_state_save(APM_CNT_ELOG_GSMI);
 
 	if (!io_smi)
 		return;
@@ -347,7 +347,7 @@ static void southbridge_smi_apmc(void)
 		}
 		break;
 #if IS_ENABLED(CONFIG_ELOG_GSMI)
-	case ELOG_GSMI_APM_CNT:
+	case APM_CNT_ELOG_GSMI:
 		southbridge_smi_gsmi();
 		break;
 #endif
diff --git a/src/soc/intel/braswell/smihandler.c b/src/soc/intel/braswell/smihandler.c
index edbb766109..a4d2d88310 100644
--- a/src/soc/intel/braswell/smihandler.c
+++ b/src/soc/intel/braswell/smihandler.c
@@ -263,7 +263,7 @@ static void southbridge_smi_gsmi(void)
 	u32 *ret, *param;
 	uint8_t sub_command;
 	em64t100_smm_state_save_area_t *io_smi =
-		smi_apmc_find_state_save(ELOG_GSMI_APM_CNT);
+		smi_apmc_find_state_save(APM_CNT_ELOG_GSMI);
 
 	if (!io_smi)
 		return;
@@ -344,7 +344,7 @@ static void southbridge_smi_apmc(void)
 		}
 		break;
 #if IS_ENABLED(CONFIG_ELOG_GSMI)
-	case ELOG_GSMI_APM_CNT:
+	case APM_CNT_ELOG_GSMI:
 		southbridge_smi_gsmi();
 		break;
 #endif
diff --git a/src/soc/intel/broadwell/smihandler.c b/src/soc/intel/broadwell/smihandler.c
index 24f6a3df72..64a315d30e 100644
--- a/src/soc/intel/broadwell/smihandler.c
+++ b/src/soc/intel/broadwell/smihandler.c
@@ -300,7 +300,7 @@ static void southbridge_smi_gsmi(void)
 	u32 *ret, *param;
 	u8 sub_command;
 	em64t101_smm_state_save_area_t *io_smi =
-		smi_apmc_find_state_save(ELOG_GSMI_APM_CNT);
+		smi_apmc_find_state_save(APM_CNT_ELOG_GSMI);
 
 	if (!io_smi)
 		return;
@@ -374,7 +374,7 @@ static void southbridge_smi_apmc(void)
 		}
 		break;
 #if IS_ENABLED(CONFIG_ELOG_GSMI)
-	case ELOG_GSMI_APM_CNT:
+	case APM_CNT_ELOG_GSMI:
 		southbridge_smi_gsmi();
 		break;
 #endif
diff --git a/src/soc/intel/common/block/smm/smihandler.c b/src/soc/intel/common/block/smm/smihandler.c
index 0832bb5558..093c50eb6b 100644
--- a/src/soc/intel/common/block/smm/smihandler.c
+++ b/src/soc/intel/common/block/smm/smihandler.c
@@ -279,7 +279,7 @@ static void southbridge_smi_gsmi(
 	void *io_smi = NULL;
 	uint32_t reg_ebx;
 
-	io_smi = find_save_state(save_state_ops, ELOG_GSMI_APM_CNT);
+	io_smi = find_save_state(save_state_ops, APM_CNT_ELOG_GSMI);
 	if (!io_smi)
 		return;
 	/* Command and return value in EAX */
@@ -387,7 +387,7 @@ void smihandler_southbridge_apmc(
 			printk(BIOS_DEBUG, "SMI#: Setting GNVS to %p\n", gnvs);
 		}
 		break;
-	case ELOG_GSMI_APM_CNT:
+	case APM_CNT_ELOG_GSMI:
 		if (IS_ENABLED(CONFIG_ELOG_GSMI))
 			southbridge_smi_gsmi(save_state_ops);
 		break;
diff --git a/src/soc/intel/fsp_baytrail/smihandler.c b/src/soc/intel/fsp_baytrail/smihandler.c
index 48c828be66..e8021cef26 100644
--- a/src/soc/intel/fsp_baytrail/smihandler.c
+++ b/src/soc/intel/fsp_baytrail/smihandler.c
@@ -212,7 +212,7 @@ static void southbridge_smi_gsmi(void)
 	u32 *ret, *param;
 	uint8_t sub_command;
 	em64t100_smm_state_save_area_t *io_smi =
-		smi_apmc_find_state_save(ELOG_GSMI_APM_CNT);
+		smi_apmc_find_state_save(APM_CNT_ELOG_GSMI);
 
 	if (!io_smi)
 		return;
@@ -274,7 +274,7 @@ static void southbridge_smi_apmc(void)
 		}
 		break;
 #if IS_ENABLED(CONFIG_ELOG_GSMI)
-	case ELOG_GSMI_APM_CNT:
+	case APM_CNT_ELOG_GSMI:
 		southbridge_smi_gsmi();
 		break;
 #endif
diff --git a/src/southbridge/intel/common/smihandler.c b/src/southbridge/intel/common/smihandler.c
index 0ad400cde0..6347ad663b 100644
--- a/src/southbridge/intel/common/smihandler.c
+++ b/src/southbridge/intel/common/smihandler.c
@@ -249,7 +249,7 @@ static void southbridge_smi_gsmi(void)
 	u32 *ret, *param;
 	u8 sub_command;
 	em64t101_smm_state_save_area_t *io_smi =
-		smi_apmc_find_state_save(ELOG_GSMI_APM_CNT);
+		smi_apmc_find_state_save(APM_CNT_ELOG_GSMI);
 
 	if (!io_smi)
 		return;
@@ -316,7 +316,7 @@ static void southbridge_smi_apmc(void)
 		mainboard_finalized = 1;
 		break;
 #if IS_ENABLED(CONFIG_ELOG_GSMI)
-	case ELOG_GSMI_APM_CNT:
+	case APM_CNT_ELOG_GSMI:
 		southbridge_smi_gsmi();
 		break;
 #endif
diff --git a/src/southbridge/intel/ibexpeak/smihandler.c b/src/southbridge/intel/ibexpeak/smihandler.c
index b70273c76c..e510f19b6c 100644
--- a/src/southbridge/intel/ibexpeak/smihandler.c
+++ b/src/southbridge/intel/ibexpeak/smihandler.c
@@ -537,7 +537,7 @@ static void southbridge_smi_gsmi(void)
 	u32 *ret, *param;
 	u8 sub_command;
 	em64t101_smm_state_save_area_t *io_smi =
-		smi_apmc_find_state_save(ELOG_GSMI_APM_CNT);
+		smi_apmc_find_state_save(APM_CNT_ELOG_GSMI);
 
 	if (!io_smi)
 		return;
@@ -604,7 +604,7 @@ static void southbridge_smi_apmc(void)
 		}
 		break;
 #if IS_ENABLED(CONFIG_ELOG_GSMI)
-	case ELOG_GSMI_APM_CNT:
+	case APM_CNT_ELOG_GSMI:
 		southbridge_smi_gsmi();
 		break;
 #endif
diff --git a/src/southbridge/intel/lynxpoint/smihandler.c b/src/southbridge/intel/lynxpoint/smihandler.c
index a3965d0578..72298f3d91 100644
--- a/src/southbridge/intel/lynxpoint/smihandler.c
+++ b/src/southbridge/intel/lynxpoint/smihandler.c
@@ -253,7 +253,7 @@ static void southbridge_smi_gsmi(void)
 	u32 *ret, *param;
 	u8 sub_command;
 	em64t101_smm_state_save_area_t *io_smi =
-		smi_apmc_find_state_save(ELOG_GSMI_APM_CNT);
+		smi_apmc_find_state_save(APM_CNT_ELOG_GSMI);
 
 	if (!io_smi)
 		return;
@@ -333,7 +333,7 @@ static void southbridge_smi_apmc(void)
 		usb_xhci_route_all();
 		break;
 #if IS_ENABLED(CONFIG_ELOG_GSMI)
-	case ELOG_GSMI_APM_CNT:
+	case APM_CNT_ELOG_GSMI:
 		southbridge_smi_gsmi();
 		break;
 #endif