summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Held <felix-coreboot@felixheld.de>2021-02-10 03:29:48 +0100
committerMartin Roth <martinroth@google.com>2021-02-11 02:45:48 +0000
commita3a66b6e6845da98c0a0768c7c4ef2e365068044 (patch)
tree7cb74f7a0b0775b67133b9860cc61497643a3a5f
parentbc134812c3038b001d6b8a6c9fd30b1574e8517a (diff)
downloadcoreboot-a3a66b6e6845da98c0a0768c7c4ef2e365068044.tar.xz
soc/amd: move southbridge_smi_handler to common code
Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Change-Id: I650498321736eee3d33af51216eda1b650f11744 Reviewed-on: https://review.coreboot.org/c/coreboot/+/50463 Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com> Reviewed-by: Martin Roth <martinroth@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/soc/amd/cezanne/smihandler.c5
-rw-r--r--src/soc/amd/common/block/cpu/smm/Makefile.inc1
-rw-r--r--src/soc/amd/common/block/cpu/smm/smi_handler.c50
-rw-r--r--src/soc/amd/common/block/include/amdblocks/smm.h1
-rw-r--r--src/soc/amd/picasso/smihandler.c46
-rw-r--r--src/soc/amd/stoneyridge/smihandler.c46
6 files changed, 59 insertions, 90 deletions
diff --git a/src/soc/amd/cezanne/smihandler.c b/src/soc/amd/cezanne/smihandler.c
index 2d9e487984..b941293286 100644
--- a/src/soc/amd/cezanne/smihandler.c
+++ b/src/soc/amd/cezanne/smihandler.c
@@ -1,7 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
-#include <cpu/x86/smm.h>
+#include <amdblocks/smm.h>
-void southbridge_smi_handler(void)
+void *get_smi_source_handler(int source)
{
+ return NULL;
}
diff --git a/src/soc/amd/common/block/cpu/smm/Makefile.inc b/src/soc/amd/common/block/cpu/smm/Makefile.inc
index 0639890207..c8815227eb 100644
--- a/src/soc/amd/common/block/cpu/smm/Makefile.inc
+++ b/src/soc/amd/common/block/cpu/smm/Makefile.inc
@@ -1,5 +1,6 @@
ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_SMM),y)
ramstage-y += smm_relocate.c
+smm-y += smi_handler.c
endif # CONFIG_SOC_AMD_COMMON_BLOCK_SMM
diff --git a/src/soc/amd/common/block/cpu/smm/smi_handler.c b/src/soc/amd/common/block/cpu/smm/smi_handler.c
new file mode 100644
index 0000000000..00c03f022e
--- /dev/null
+++ b/src/soc/amd/common/block/cpu/smm/smi_handler.c
@@ -0,0 +1,50 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include <amdblocks/acpimmio.h>
+#include <amdblocks/smi.h>
+#include <amdblocks/smm.h>
+#include <cpu/x86/smm.h>
+#include <soc/smi.h>
+
+static void process_smi_sources(uint32_t reg)
+{
+ const uint32_t status = smi_read32(reg);
+ int bit_zero = 32 / sizeof(uint32_t) * (reg - SMI_REG_SMISTS0);
+ void (*source_handler)(void);
+ int i;
+
+ for (i = 0 ; i < 32 ; i++) {
+ if (status & (1 << i)) {
+ source_handler = get_smi_source_handler(i + bit_zero);
+ if (source_handler)
+ source_handler();
+ }
+ }
+
+ if (reg == SMI_REG_SMISTS0)
+ if (status & GEVENT_MASK)
+ /* Gevent[23:0] are assumed to be mainboard-specific */
+ mainboard_smi_gpi(status & GEVENT_MASK);
+
+ /* Clear all events in this register */
+ smi_write32(reg, status);
+}
+
+void southbridge_smi_handler(void)
+{
+ const uint16_t smi_src = smi_read16(SMI_REG_POINTER);
+
+ if (smi_src & SMI_STATUS_SRC_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)
+ process_smi_sources(SMI_REG_SMISTS1);
+ if (smi_src & SMI_STATUS_SRC_2)
+ process_smi_sources(SMI_REG_SMISTS2);
+ if (smi_src & SMI_STATUS_SRC_3)
+ process_smi_sources(SMI_REG_SMISTS3);
+ if (smi_src & SMI_STATUS_SRC_4)
+ process_smi_sources(SMI_REG_SMISTS4);
+}
diff --git a/src/soc/amd/common/block/include/amdblocks/smm.h b/src/soc/amd/common/block/include/amdblocks/smm.h
index 0fbef42892..637f034ada 100644
--- a/src/soc/amd/common/block/include/amdblocks/smm.h
+++ b/src/soc/amd/common/block/include/amdblocks/smm.h
@@ -10,3 +10,4 @@ struct smm_relocation_params {
void get_smm_info(uintptr_t *perm_smbase, size_t *perm_smsize, size_t *smm_save_state_size);
void smm_relocation_handler(int cpu, uintptr_t curr_smbase, uintptr_t staggered_smbase);
+void *get_smi_source_handler(int source);
diff --git a/src/soc/amd/picasso/smihandler.c b/src/soc/amd/picasso/smihandler.c
index 626daad00a..928669dfef 100644
--- a/src/soc/amd/picasso/smihandler.c
+++ b/src/soc/amd/picasso/smihandler.c
@@ -15,6 +15,7 @@
#include <amdblocks/acpi.h>
#include <amdblocks/psp.h>
#include <amdblocks/smi.h>
+#include <amdblocks/smm.h>
#include <elog.h>
#include <soc/smu.h>
@@ -222,7 +223,7 @@ static const struct smi_sources_t smi_sources[] = {
{ .type = SMITYPE_SLP_TYP, .handler = sb_slp_typ_handler},
};
-static void *get_source_handler(int source)
+void *get_smi_source_handler(int source)
{
int i;
@@ -232,46 +233,3 @@ static void *get_source_handler(int source)
return NULL;
}
-
-static void process_smi_sources(uint32_t reg)
-{
- const uint32_t status = smi_read32(reg);
- int bit_zero = 32 / sizeof(uint32_t) * (reg - SMI_REG_SMISTS0);
- void (*source_handler)(void);
- int i;
-
- for (i = 0 ; i < 32 ; i++) {
- if (status & (1 << i)) {
- source_handler = get_source_handler(i + bit_zero);
- if (source_handler)
- source_handler();
- }
- }
-
- if (reg == SMI_REG_SMISTS0)
- if (status & GEVENT_MASK)
- /* Gevent[23:0] are assumed to be mainboard-specific */
- mainboard_smi_gpi(status & GEVENT_MASK);
-
- /* Clear all events in this register */
- smi_write32(reg, status);
-}
-
-void southbridge_smi_handler(void)
-{
- const uint16_t smi_src = smi_read16(SMI_REG_POINTER);
-
- if (smi_src & SMI_STATUS_SRC_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)
- process_smi_sources(SMI_REG_SMISTS1);
- if (smi_src & SMI_STATUS_SRC_2)
- process_smi_sources(SMI_REG_SMISTS2);
- if (smi_src & SMI_STATUS_SRC_3)
- process_smi_sources(SMI_REG_SMISTS3);
- if (smi_src & SMI_STATUS_SRC_4)
- process_smi_sources(SMI_REG_SMISTS4);
-}
diff --git a/src/soc/amd/stoneyridge/smihandler.c b/src/soc/amd/stoneyridge/smihandler.c
index ffcbaea72b..0b0f5c1e26 100644
--- a/src/soc/amd/stoneyridge/smihandler.c
+++ b/src/soc/amd/stoneyridge/smihandler.c
@@ -14,6 +14,7 @@
#include <amdblocks/acpimmio.h>
#include <amdblocks/acpi.h>
#include <amdblocks/smi.h>
+#include <amdblocks/smm.h>
#include <elog.h>
/* bits in smm_io_trap */
@@ -217,7 +218,7 @@ static const struct smi_sources_t smi_sources[] = {
{ .type = SMITYPE_SLP_TYP, .handler = sb_slp_typ_handler},
};
-static void *get_source_handler(int source)
+void *get_smi_source_handler(int source)
{
int i;
@@ -227,46 +228,3 @@ static void *get_source_handler(int source)
return NULL;
}
-
-static void process_smi_sources(uint32_t reg)
-{
- const uint32_t status = smi_read32(reg);
- int bit_zero = 32 / sizeof(uint32_t) * (reg - SMI_REG_SMISTS0);
- void (*source_handler)(void);
- int i;
-
- for (i = 0 ; i < 32 ; i++) {
- if (status & (1 << i)) {
- source_handler = get_source_handler(i + bit_zero);
- if (source_handler)
- source_handler();
- }
- }
-
- if (reg == SMI_REG_SMISTS0)
- if (status & GEVENT_MASK)
- /* Gevent[23:0] are assumed to be mainboard-specific */
- mainboard_smi_gpi(status & GEVENT_MASK);
-
- /* Clear all events in this register */
- smi_write32(reg, status);
-}
-
-void southbridge_smi_handler(void)
-{
- const uint16_t smi_src = smi_read16(SMI_REG_POINTER);
-
- if (smi_src & SMI_STATUS_SRC_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)
- process_smi_sources(SMI_REG_SMISTS1);
- if (smi_src & SMI_STATUS_SRC_2)
- process_smi_sources(SMI_REG_SMISTS2);
- if (smi_src & SMI_STATUS_SRC_3)
- process_smi_sources(SMI_REG_SMISTS3);
- if (smi_src & SMI_STATUS_SRC_4)
- process_smi_sources(SMI_REG_SMISTS4);
-}