[coreboot-gerrit] Change in coreboot[master]: soc/amd*/smihandler: factor out and rename clear_smi_sci_status

[Felix Held (Code Review)]

Attention is currently required from: Jason Glenesk, Raul Rangel, Marshall Dawson.
Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/50460 )

Change subject: soc/amd*/smihandler: factor out and rename clear_smi_sci_status
......................................................................

soc/amd*/smihandler: factor out and rename clear_smi_sci_status

Signed-off-by: Felix Held 
Change-Id: Ifd6c3bebee1ccf7e7e7987d8ae3d9fa654019791
---
M src/soc/amd/common/block/include/amdblocks/smi.h
M src/soc/amd/common/block/smi/smi_util.c
M src/soc/amd/picasso/smihandler.c
M src/soc/amd/stoneyridge/smihandler.c
4 files changed, 10 insertions(+), 18 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/60/50460/1

diff --git a/src/soc/amd/common/block/include/amdblocks/smi.h b/src/soc/amd/common/block/include/amdblocks/smi.h
index 25a1da7..97edd2c 100644
--- a/src/soc/amd/common/block/include/amdblocks/smi.h
+++ b/src/soc/amd/common/block/include/amdblocks/smi.h
@@ -48,5 +48,6 @@
 void gpe_configure_sci(const struct sci_source *scis, size_t num_gpes);
 void soc_route_sci(uint8_t event);
 void clear_all_smi_status(void);
+void clear_smi_sci_status(void);

#endif /* AMD_BLOCK_SMI_H */
diff --git a/src/soc/amd/common/block/smi/smi_util.c b/src/soc/amd/common/block/smi/smi_util.c
index aa37dab..b763c3b 100644
--- a/src/soc/amd/common/block/smi/smi_util.c
+++ b/src/soc/amd/common/block/smi/smi_util.c
@@ -154,3 +154,8 @@
    smi_write32(SMI_REG_SMISTS3, smi_read32(SMI_REG_SMISTS3));
    smi_write32(SMI_REG_SMISTS4, smi_read32(SMI_REG_SMISTS4));
 }
+
+void clear_smi_sci_status(void)
+{
+	smi_write32(SMI_SCI_STATUS, smi_read32(SMI_SCI_STATUS));
+}
diff --git a/src/soc/amd/picasso/smihandler.c b/src/soc/amd/picasso/smihandler.c
index 5134358..626daad 100644
--- a/src/soc/amd/picasso/smihandler.c
+++ b/src/soc/amd/picasso/smihandler.c
@@ -222,14 +222,6 @@
    { .type = SMITYPE_SLP_TYP, .handler = sb_slp_typ_handler},
 };

-static void process_smi_sci(void)
-{
-	const uint32_t status = smi_read32(SMI_SCI_STATUS);
-
-	/* Clear events to prevent re-entering SMI if event isn't handled */
-	smi_write32(SMI_SCI_STATUS, status);
-}
-
 static void *get_source_handler(int source)
 {
    int i;
@@ -270,7 +262,8 @@
    const uint16_t smi_src = smi_read16(SMI_REG_POINTER);

if (smi_src & SMI_STATUS_SRC_SCI)
-		process_smi_sci();
+		/* Clear events to prevent re-entering SMI if event isn't handled */
+		clear_smi_sci_status();
    if (smi_src & SMI_STATUS_SRC_0)
    	process_smi_sources(SMI_REG_SMISTS0);
    if (smi_src & SMI_STATUS_SRC_1)
diff --git a/src/soc/amd/stoneyridge/smihandler.c b/src/soc/amd/stoneyridge/smihandler.c
index e90bdb1..ffcbaea 100644
--- a/src/soc/amd/stoneyridge/smihandler.c
+++ b/src/soc/amd/stoneyridge/smihandler.c
@@ -217,14 +217,6 @@
    { .type = SMITYPE_SLP_TYP, .handler = sb_slp_typ_handler},
 };

-static void process_smi_sci(void)
-{
-	const uint32_t status = smi_read32(SMI_SCI_STATUS);
-
-	/* Clear events to prevent re-entering SMI if event isn't handled */
-	smi_write32(SMI_SCI_STATUS, status);
-}
-
 static void *get_source_handler(int source)
 {
    int i;
@@ -265,7 +257,8 @@
    const uint16_t smi_src = smi_read16(SMI_REG_POINTER);

if (smi_src & SMI_STATUS_SRC_SCI)
-		process_smi_sci();
+		/* Clear events to prevent re-entering SMI if event isn't handled */
+		clear_smi_sci_status();
    if (smi_src & SMI_STATUS_SRC_0)
    	process_smi_sources(SMI_REG_SMISTS0);
    if (smi_src & SMI_STATUS_SRC_1)