GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Kyösti Mälkki 2014-06-19 20:44:34 +03:00 committed by Patrick Georgi
parent 58ceb00ea7
commit 8ae16a44a4
3 changed files with 8 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/northbridge/amd/agesa/family14/northbridge.c
View File

@ -19,6 +19,7 @@
#include <console/console.h> #include <console/console.h>
#include <arch/io.h> #include <arch/io.h>
#include <arch/acpi.h>
#include <stdint.h> #include <stdint.h>
#include <device/device.h> #include <device/device.h>
#include <device/pci.h> #include <device/pci.h>
@ -755,8 +756,6 @@ static void domain_set_resources(device_t dev)
printk(BIOS_DEBUG, " adsr - leaving this lovely routine.\n"); printk(BIOS_DEBUG, " adsr - leaving this lovely routine.\n");
} }
extern u8 acpi_slp_type;
static void domain_enable_resources(device_t dev) static void domain_enable_resources(device_t dev)
{ {
u32 val; u32 val;
@ -778,8 +777,7 @@ static void domain_enable_resources(device_t dev)
/* Must be called after PCI enumeration and resource allocation */ /* Must be called after PCI enumeration and resource allocation */
printk(BIOS_DEBUG, "\nFam14h - %s\n", __func__); printk(BIOS_DEBUG, "\nFam14h - %s\n", __func__);
#if CONFIG_HAVE_ACPI_RESUME if (!acpi_is_wakeup_s3()) {
if (acpi_slp_type != 3) {
printk(BIOS_DEBUG, "agesawrapper_amdinitmid "); printk(BIOS_DEBUG, "agesawrapper_amdinitmid ");
val = agesawrapper_amdinitmid (); val = agesawrapper_amdinitmid ();
if (val) if (val)
@ -787,14 +785,6 @@ static void domain_enable_resources(device_t dev)
else else
printk(BIOS_DEBUG, "passed.\n"); 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 domain_enable_resources.\n"); printk(BIOS_DEBUG, " ader - leaving domain_enable_resources.\n");
} }

18
src/northbridge/amd/agesa/family15tn/northbridge.c
View File

@ -19,6 +19,7 @@
#include <console/console.h> #include <console/console.h>
#include <arch/io.h> #include <arch/io.h>
#include <arch/acpi.h>
#include <stdint.h> #include <stdint.h>
#include <device/device.h> #include <device/device.h>
#include <device/pci.h> #include <device/pci.h>
@ -552,20 +553,15 @@ static void domain_read_resources(device_t dev)
#endif #endif
} }
extern u8 acpi_slp_type;
static void domain_enable_resources(device_t dev) static void domain_enable_resources(device_t dev)
{ {
u32 val; u32 val;
#if CONFIG_HAVE_ACPI_RESUME if (acpi_is_wakeup_s3())
if (acpi_slp_type == 3)
agesawrapper_fchs3laterestore(); agesawrapper_fchs3laterestore();
#endif
/* Must be called after PCI enumeration and resource allocation */ /* Must be called after PCI enumeration and resource allocation */
printk(BIOS_DEBUG, "\nFam15 - %s: AmdInitMid.\n", __func__); printk(BIOS_DEBUG, "\nFam15 - %s: AmdInitMid.\n", __func__);
#if CONFIG_HAVE_ACPI_RESUME if (!acpi_is_wakeup_s3()) {
if (acpi_slp_type != 3) {
printk(BIOS_DEBUG, "agesawrapper_amdinitmid "); printk(BIOS_DEBUG, "agesawrapper_amdinitmid ");
val = agesawrapper_amdinitmid (); val = agesawrapper_amdinitmid ();
if (val) if (val)
@ -573,14 +569,6 @@ static void domain_enable_resources(device_t dev)
else else
printk(BIOS_DEBUG, "passed.\n"); 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__); printk(BIOS_DEBUG, " ader - leaving %s.\n", __func__);
} }

18
src/northbridge/amd/agesa/family16kb/northbridge.c
View File

@ -19,6 +19,7 @@
#include <console/console.h> #include <console/console.h>
#include <arch/io.h> #include <arch/io.h>
#include <arch/acpi.h>
#include <stdint.h> #include <stdint.h>
#include <device/device.h> #include <device/device.h>
#include <device/pci.h> #include <device/pci.h>
@ -556,20 +557,15 @@ static void domain_read_resources(device_t dev)
#endif #endif
} }
extern u8 acpi_slp_type;
static void domain_enable_resources(device_t dev) static void domain_enable_resources(device_t dev)
{ {
u32 val; u32 val;
#if CONFIG_HAVE_ACPI_RESUME if (acpi_is_wakeup_s3())
if (acpi_slp_type == 3)
agesawrapper_fchs3laterestore(); agesawrapper_fchs3laterestore();
#endif
/* Must be called after PCI enumeration and resource allocation */ /* Must be called after PCI enumeration and resource allocation */
printk(BIOS_DEBUG, "\nFam16 - domain_enable_resources: AmdInitMid.\n"); printk(BIOS_DEBUG, "\nFam16 - domain_enable_resources: AmdInitMid.\n");
#if CONFIG_HAVE_ACPI_RESUME if (!acpi_is_wakeup_s3()) {
if (acpi_slp_type != 3) {
printk(BIOS_DEBUG, "agesawrapper_amdinitmid "); printk(BIOS_DEBUG, "agesawrapper_amdinitmid ");
val = agesawrapper_amdinitmid (); val = agesawrapper_amdinitmid ();
if (val) if (val)
@ -577,14 +573,6 @@ static void domain_enable_resources(device_t dev)
else else
printk(BIOS_DEBUG, "passed.\n"); 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 domain_enable_resources.\n"); printk(BIOS_DEBUG, " ader - leaving domain_enable_resources.\n");
} }