From d61839c3ea6dd5e35f680ce56b9e2f8247833116 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Mon, 3 Dec 2018 16:10:33 +0100 Subject: elog: make elog's SMM handler code follow everything else Instead of ELOG_GSMI_APM_CNT use APM_CNT_ELOG_GSMI and define it in cpu/x86/smm.h Change-Id: I3a3e2f823c91b475d1e15b8c20e9cf5f3fd9de83 Signed-off-by: Patrick Georgi Reviewed-on: https://review.coreboot.org/c/30022 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/soc/intel/baytrail/smihandler.c | 4 ++-- src/soc/intel/braswell/smihandler.c | 4 ++-- src/soc/intel/broadwell/smihandler.c | 4 ++-- src/soc/intel/common/block/smm/smihandler.c | 4 ++-- src/soc/intel/fsp_baytrail/smihandler.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/soc/intel') 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 -- cgit v1.2.3