summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-10-08 19:25:57 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-11-23 18:34:19 +0000
commitf3758b6738d2968980309257197ef4f1977dc974 (patch)
treeab5425987a3c8ed8f054a6c8407029d3ecb28d0c
parent27cb3e0d31275e702e34a2085f9cf248b742d3cf (diff)
downloadcoreboot-f3758b6738d2968980309257197ef4f1977dc974.tar.xz
AGESA,binaryPI: Move SCI enable outside table creation
Preferably, coreboot tables creation is kept hardware-invariant. Change-Id: I37810771090dd9b0377f9a72c7a17ef1564ccf68 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/36812 Reviewed-by: Michał Żygowski <michal.zygowski@3mdeb.com> Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/southbridge/amd/agesa/hudson/fadt.c3
-rw-r--r--src/southbridge/amd/agesa/hudson/lpc.c12
-rw-r--r--src/southbridge/amd/pi/hudson/fadt.c3
-rw-r--r--src/southbridge/amd/pi/hudson/lpc.c12
4 files changed, 24 insertions, 6 deletions
diff --git a/src/southbridge/amd/agesa/hudson/fadt.c b/src/southbridge/amd/agesa/hudson/fadt.c
index 28f035c3b8..425a084a07 100644
--- a/src/southbridge/amd/agesa/hudson/fadt.c
+++ b/src/southbridge/amd/agesa/hudson/fadt.c
@@ -20,7 +20,6 @@
#include <string.h>
#include <console/console.h>
#include <arch/acpi.h>
-#include <arch/io.h>
#include <device/device.h>
#include <version.h>
@@ -78,7 +77,6 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt)
fadt->s4bios_req = 0; /* Not supported */
fadt->pstate_cnt = 0; /* Not supported */
fadt->cst_cnt = 0; /* Not supported */
- outl(0x0, ACPI_PM1_CNT_BLK); /* clear SCI_EN */
} else {
fadt->smi_cmd = 0; /* disable system management mode */
fadt->acpi_enable = 0; /* unused if SMI_CMD = 0 */
@@ -86,7 +84,6 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt)
fadt->s4bios_req = 0; /* unused if SMI_CMD = 0 */
fadt->pstate_cnt = 0; /* unused if SMI_CMD = 0 */
fadt->cst_cnt = 0x00; /* unused if SMI_CMD = 0 */
- outl(0x1, ACPI_PM1_CNT_BLK); /* set SCI_EN */
}
fadt->pm1a_evt_blk = ACPI_PM_EVT_BLK;
diff --git a/src/southbridge/amd/agesa/hudson/lpc.c b/src/southbridge/amd/agesa/hudson/lpc.c
index 4cfbb6487e..eed1aec2e3 100644
--- a/src/southbridge/amd/agesa/hudson/lpc.c
+++ b/src/southbridge/amd/agesa/hudson/lpc.c
@@ -23,6 +23,7 @@
#include <device/pci_def.h>
#include <pc80/mc146818rtc.h>
#include <pc80/isa-dma.h>
+#include <arch/io.h>
#include <arch/ioapic.h>
#include <arch/acpi.h>
#include <pc80/i8254.h>
@@ -335,6 +336,16 @@ unsigned long acpi_fill_mcfg(unsigned long current)
return current;
}
+static void lpc_final(struct device *dev)
+{
+ if (!acpi_is_wakeup_s3()) {
+ if (CONFIG(HAVE_SMI_HANDLER))
+ outl(0x0, ACPI_PM1_CNT_BLK); /* clear SCI_EN */
+ else
+ outl(0x1, ACPI_PM1_CNT_BLK); /* set SCI_EN */
+ }
+}
+
static struct pci_operations lops_pci = {
.set_subsystem = pci_dev_set_subsystem,
};
@@ -347,6 +358,7 @@ static struct device_operations lpc_ops = {
.write_acpi_tables = acpi_write_hpet,
#endif
.init = lpc_init,
+ .final = lpc_final,
.scan_bus = scan_static_bus,
.ops_pci = &lops_pci,
.acpi_name = lpc_acpi_name,
diff --git a/src/southbridge/amd/pi/hudson/fadt.c b/src/southbridge/amd/pi/hudson/fadt.c
index 28e20d38ca..61e046df0f 100644
--- a/src/southbridge/amd/pi/hudson/fadt.c
+++ b/src/southbridge/amd/pi/hudson/fadt.c
@@ -20,7 +20,6 @@
#include <string.h>
#include <console/console.h>
#include <arch/acpi.h>
-#include <arch/io.h>
#include <device/device.h>
#include <version.h>
@@ -70,7 +69,6 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt)
fadt->s4bios_req = 0; /* Not supported */
fadt->pstate_cnt = 0; /* Not supported */
fadt->cst_cnt = 0; /* Not supported */
- outl(0x0, ACPI_PM1_CNT_BLK); /* clear SCI_EN */
} else {
fadt->smi_cmd = 0; /* disable system management mode */
fadt->acpi_enable = 0; /* unused if SMI_CMD = 0 */
@@ -78,7 +76,6 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt)
fadt->s4bios_req = 0; /* unused if SMI_CMD = 0 */
fadt->pstate_cnt = 0; /* unused if SMI_CMD = 0 */
fadt->cst_cnt = 0x00; /* unused if SMI_CMD = 0 */
- outl(0x1, ACPI_PM1_CNT_BLK); /* set SCI_EN */
}
fadt->pm1a_evt_blk = ACPI_PM_EVT_BLK;
diff --git a/src/southbridge/amd/pi/hudson/lpc.c b/src/southbridge/amd/pi/hudson/lpc.c
index 1e080a0e8e..e65fd838b0 100644
--- a/src/southbridge/amd/pi/hudson/lpc.c
+++ b/src/southbridge/amd/pi/hudson/lpc.c
@@ -23,6 +23,7 @@
#include <device/pci_def.h>
#include <pc80/mc146818rtc.h>
#include <pc80/isa-dma.h>
+#include <arch/io.h>
#include <arch/ioapic.h>
#include <arch/acpi.h>
#include <pc80/i8254.h>
@@ -351,6 +352,16 @@ static const char *lpc_acpi_name(const struct device *dev)
return NULL;
}
+static void lpc_final(struct device *dev)
+{
+ if (!acpi_is_wakeup_s3()) {
+ if (CONFIG(HAVE_SMI_HANDLER))
+ outl(0x0, ACPI_PM1_CNT_BLK); /* clear SCI_EN */
+ else
+ outl(0x1, ACPI_PM1_CNT_BLK); /* set SCI_EN */
+ }
+}
+
static struct pci_operations lops_pci = {
.set_subsystem = pci_dev_set_subsystem,
};
@@ -363,6 +374,7 @@ static struct device_operations lpc_ops = {
.write_acpi_tables = acpi_write_hpet,
#endif
.init = lpc_init,
+ .final = lpc_final,
.scan_bus = scan_static_bus,
.ops_pci = &lops_pci,
.acpi_name = lpc_acpi_name,