northbridge/amd/agesa: Use acpi_is_wakeup_s3()
Change-Id: Ia6f5b0454e7fbbf36baa2372dfeec51b5f5e8f67
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/6076
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c
index 2b5549d..8c931ad 100644
--- a/src/northbridge/amd/agesa/family15tn/northbridge.c
+++ b/src/northbridge/amd/agesa/family15tn/northbridge.c
@@ -19,6 +19,7 @@
#include <console/console.h>
#include <arch/io.h>
+#include <arch/acpi.h>
#include <stdint.h>
#include <device/device.h>
#include <device/pci.h>
@@ -552,20 +553,15 @@
#endif
}
-extern u8 acpi_slp_type;
-
static void domain_enable_resources(device_t dev)
{
u32 val;
-#if CONFIG_HAVE_ACPI_RESUME
- if (acpi_slp_type == 3)
+ if (acpi_is_wakeup_s3())
agesawrapper_fchs3laterestore();
-#endif
/* Must be called after PCI enumeration and resource allocation */
printk(BIOS_DEBUG, "\nFam15 - %s: AmdInitMid.\n", __func__);
-#if CONFIG_HAVE_ACPI_RESUME
- if (acpi_slp_type != 3) {
+ if (!acpi_is_wakeup_s3()) {
printk(BIOS_DEBUG, "agesawrapper_amdinitmid ");
val = agesawrapper_amdinitmid ();
if (val)
@@ -573,14 +569,6 @@
else
printk(BIOS_DEBUG, "passed.\n");
}
-#else
- printk(BIOS_DEBUG, "agesawrapper_amdinitmid ");
- val = agesawrapper_amdinitmid ();
- if (val)
- printk(BIOS_DEBUG, "error level: %x \n", val);
- else
- printk(BIOS_DEBUG, "passed.\n");
-#endif
printk(BIOS_DEBUG, " ader - leaving %s.\n", __func__);
}