[coreboot-gerrit] Change in coreboot[master]: amd/stoneyridge: Refactor SMI handler
Marshall Dawson (Code Review)
gerrit at coreboot.org
Thu Sep 28 18:27:54 CEST 2017
Marshall Dawson has uploaded this change for review. ( https://review.coreboot.org/21746
Change subject: amd/stoneyridge: Refactor SMI handler
......................................................................
amd/stoneyridge: Refactor SMI handler
Rewrite the handler to be more compact and extendable. The old
functionality is duplicated after the rewrite. All SMI source registers
(except for SmiSciStatus) behave identically so these are consolidated.
Register 0x80 contains sources 0-31, 0x81 sources 32-63, and so on.
Create a table of mini-handlers to be supported in the soc directory.
As SMI sources are discovered, attempt to find the corresponding handler
and then execute it.
Change-Id: Ic7050ecf65c2af036fe297f429a0bbdc709ad4c1
Signed-off-by: Marshall Dawson <marshalldawson3rd at gmail.com>
---
M src/soc/amd/stoneyridge/include/soc/smi.h
M src/soc/amd/stoneyridge/smihandler.c
2 files changed, 56 insertions(+), 50 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/46/21746/1
diff --git a/src/soc/amd/stoneyridge/include/soc/smi.h b/src/soc/amd/stoneyridge/include/soc/smi.h
index c024c08..ed4a6c0 100644
--- a/src/soc/amd/stoneyridge/include/soc/smi.h
+++ b/src/soc/amd/stoneyridge/include/soc/smi.h
@@ -196,6 +196,11 @@
SMI_LVL_HIGH = 1,
};
+struct smi_sources_t {
+ int type;
+ void (*handler)(void);
+};
+
static inline uint32_t smi_read32(uint8_t offset)
{
return read32((void *)(SMI_BASE + offset));
diff --git a/src/soc/amd/stoneyridge/smihandler.c b/src/soc/amd/stoneyridge/smihandler.c
index cabfd3d..8551631 100644
--- a/src/soc/amd/stoneyridge/smihandler.c
+++ b/src/soc/amd/stoneyridge/smihandler.c
@@ -1,8 +1,17 @@
/*
- * SMI handler for Hudson southbridges
+ * This file is part of the coreboot project.
*
+ * Copyright (C) 2017 Advanced Micro Devices, Inc.
* Copyright (C) 2014 Alexandru Gagniuc <mr.nuke.me at gmail.com>
- * Subject to the GNU GPL v2, or (at your option) any later version.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*/
#include <console/console.h>
@@ -37,6 +46,14 @@
return 0;
}
+/*
+ * Table of functions supported in the SMI handler. Note that SMI source setup
+ * in southbridge.c is unrelated to this list.
+ */
+struct smi_sources_t smi_sources[] = {
+ {SMITYPE_SMI_CMD_PORT, sb_apmc_smi_handler},
+};
+
static void process_smi_sci(void)
{
const uint32_t status = smi_read32(SMI_SCI_STATUS);
@@ -45,54 +62,38 @@
smi_write32(SMI_SCI_STATUS, status);
}
-static void process_gpe_smi(void)
+static void *get_source_handler(int source)
{
- const uint32_t status = smi_read32(SMI_REG_SMISTS0);
+ int i;
- /* Only Bits [23:0] indicate GEVENT SMIs. */
- if (status & GEVENT_MASK) {
- /* A GEVENT SMI occurred */
- mainboard_smi_gpi(status & GEVENT_MASK);
+ for (i = 0 ; i < ARRAY_SIZE(smi_sources) ; i++)
+ if (smi_sources[i].type == source)
+ return smi_sources[i].handler;
+
+ return NULL;
+}
+
+static void process_smi_sources(uint32_t reg)
+{
+ const uint32_t status = smi_read32(reg);
+ int offset = 32 * (reg - SMI_REG_SMISTS0) / 4;
+ void (*source_handler)(void);
+ int i;
+
+ for (i = 0 ; i < 32 ; i++) {
+ if (status & (1 << i)) {
+ source_handler = get_source_handler(i + offset);
+ if (source_handler)
+ source_handler();
+ }
}
- /* Clear events to prevent re-entering SMI if event isn't handled */
- smi_write32(SMI_REG_SMISTS0, status);
-}
+ if (reg == SMI_REG_SMISTS0)
+ if (status & GEVENT_MASK)
+ mainboard_smi_gpi(status & GEVENT_MASK);
-static void process_smi_0x84(void)
-{
- const uint32_t status = smi_read32(SMI_REG_SMISTS1);
-
- /* Clear events to prevent re-entering SMI if event isn't handled */
- smi_write32(SMI_REG_SMISTS1, status);
-}
-
-static void process_smi_0x88(void)
-{
- const uint32_t status = smi_read32(SMI_REG_SMISTS2);
-
- if (status & TYPE_TO_MASK(SMITYPE_SMI_CMD_PORT)) {
- /* Command received via ACPI SMI command port */
- sb_apmc_smi_handler();
- }
- /* Clear events to prevent re-entering SMI if event isn't handled */
- smi_write32(SMI_REG_SMISTS2, status);
-}
-
-static void process_smi_0x8c(void)
-{
- const uint32_t status = smi_read32(SMI_REG_SMISTS3);
-
- /* Clear events to prevent re-entering SMI if event isn't handled */
- smi_write32(SMI_REG_SMISTS4, status);
-}
-
-static void process_smi_0x90(void)
-{
- const uint32_t status = smi_read32(SMI_REG_SMISTS4);
-
- /* Clear events to prevent re-entering SMI if event isn't handled */
- smi_write32(SMI_REG_SMISTS4, status);
+ /* Clear all events in this register */
+ smi_write32(reg, status);
}
void southbridge_smi_handler(void)
@@ -102,15 +103,15 @@
if (smi_src & SMI_STATUS_SRC_SCI)
process_smi_sci();
if (smi_src & SMI_STATUS_SRC_0)
- process_gpe_smi();
+ process_smi_sources(SMI_REG_SMISTS0);
if (smi_src & SMI_STATUS_SRC_1)
- process_smi_0x84();
+ process_smi_sources(SMI_REG_SMISTS1);
if (smi_src & SMI_STATUS_SRC_2)
- process_smi_0x88();
+ process_smi_sources(SMI_REG_SMISTS2);
if (smi_src & SMI_STATUS_SRC_3)
- process_smi_0x8c();
+ process_smi_sources(SMI_REG_SMISTS3);
if (smi_src & SMI_STATUS_SRC_4)
- process_smi_0x90();
+ process_smi_sources(SMI_REG_SMISTS4);
}
void southbridge_smi_set_eos(void)
--
To view, visit https://review.coreboot.org/21746
To unsubscribe, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7050ecf65c2af036fe297f429a0bbdc709ad4c1
Gerrit-Change-Number: 21746
Gerrit-PatchSet: 1
Gerrit-Owner: Marshall Dawson <marshalldawson3rd at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20170928/47ba5984/attachment-0001.html>
More information about the coreboot-gerrit
mailing list