[coreboot-gerrit] Change in ...coreboot[master]: smmstore: make smmstore's SMM handler code follow everything else

[Patrick Georgi (Code Review)]

Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30023

Change subject: smmstore: make smmstore's SMM handler code follow everything else
......................................................................

smmstore: make smmstore's SMM handler code follow everything else

Instead of SMMSTORE_APM_CNT use APM_CNT_SMMSTORE and define it in
cpu/x86/smm.h

Change-Id: Iabc0c9662284ed3ac2933001e64524011a5bf420
Signed-off-by: Patrick Georgi 
---
M src/include/cpu/x86/smm.h
M src/include/smmstore.h
M src/soc/intel/common/block/smm/smihandler.c
3 files changed, 3 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/23/30023/1

diff --git a/src/include/cpu/x86/smm.h b/src/include/cpu/x86/smm.h
index 857ab35..576449d 100644
--- a/src/include/cpu/x86/smm.h
+++ b/src/include/cpu/x86/smm.h
@@ -473,6 +473,7 @@
 #define APM_CNT_GNVS_UPDATE	0xea
 #define APM_CNT_FINALIZE	0xcb
 #define APM_CNT_LEGACY		0xcc
+#define APM_CNT_SMMSTORE	0xed
 #define APM_CNT_ELOG_GSMI	0xef
 #define APM_STS		0xb3

diff --git a/src/include/smmstore.h b/src/include/smmstore.h
index 685a425..a535c5b 100644
--- a/src/include/smmstore.h
+++ b/src/include/smmstore.h
@@ -19,8 +19,6 @@
 #include <stddef.h>
 #include <stdint.h>

-#define SMMSTORE_APM_CNT 0xed
-
 #define SMMSTORE_RET_SUCCESS 0
 #define SMMSTORE_RET_FAILURE 1
 #define SMMSTORE_RET_UNSUPPORTED 2
diff --git a/src/soc/intel/common/block/smm/smihandler.c b/src/soc/intel/common/block/smm/smihandler.c
index 093c50e..2ffc00f 100644
--- a/src/soc/intel/common/block/smm/smihandler.c
+++ b/src/soc/intel/common/block/smm/smihandler.c
@@ -301,7 +301,7 @@
    void *io_smi;
    uint32_t reg_ebx;

-	io_smi = find_save_state(save_state_ops, SMMSTORE_APM_CNT);
+	io_smi = find_save_state(save_state_ops, APM_CNT_SMMSTORE);
    if (!io_smi)
    	return;
    /* Command and return value in EAX */
@@ -391,7 +391,7 @@
    	if (IS_ENABLED(CONFIG_ELOG_GSMI))
    		southbridge_smi_gsmi(save_state_ops);
    	break;
-	case SMMSTORE_APM_CNT:
+	case APM_CNT_SMMSTORE:
    	if (IS_ENABLED(CONFIG_SMMSTORE))
    		southbridge_smi_store(save_state_ops);
    	break;