summaryrefslogtreecommitdiff
path: root/src/southbridge/amd/sb800
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2015-01-09 23:48:47 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2015-01-10 13:53:51 +0100
commit78c5d584a087265e44b076647db19efd4db4a7bb (patch)
tree0f5e32c90cf0fb17db36d514baf6afc9c037d728 /src/southbridge/amd/sb800
parent2320cbebc667ac6871d4d6c8b59fee27ba6e75e5 (diff)
downloadcoreboot-78c5d584a087265e44b076647db19efd4db4a7bb.tar.xz
ACPI: Add acpi_is_wakeup_s3() for romstage
This replaces acpi_is_wakeup_early(). Change-Id: I23112c1fc7b6f99584bc065fbf6b10fb073b1eb6 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/8187 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Diffstat (limited to 'src/southbridge/amd/sb800')
-rw-r--r--src/southbridge/amd/sb800/early_setup.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/southbridge/amd/sb800/early_setup.c b/src/southbridge/amd/sb800/early_setup.c
index 2b488d937d..24aa2007a5 100644
--- a/src/southbridge/amd/sb800/early_setup.c
+++ b/src/southbridge/amd/sb800/early_setup.c
@@ -666,20 +666,18 @@ int s3_load_nvram_early(int size, u32 *old_dword, int nvram_pos)
return nvram_pos;
}
-#if CONFIG_HAVE_ACPI_RESUME
-int acpi_is_wakeup_early(void)
+int acpi_get_sleep_type(void)
{
u16 tmp;
tmp = inw(ACPI_PM1_CNT_BLK);
- printk(BIOS_DEBUG, "IN TEST WAKEUP %x\n", tmp);
- return (((tmp & (7 << 10)) >> 10) == 3);
+ return ((tmp & (7 << 10)) >> 10);
}
unsigned long get_top_of_ram(void)
{
uint32_t xdata = 0;
int xnvram_pos = 0xfc, xi;
- if (!acpi_is_wakeup_early())
+ if (acpi_get_sleep_type() != 3)
return 0;
for (xi = 0; xi<4; xi++) {
outb(xnvram_pos, BIOSRAM_INDEX);
@@ -689,6 +687,5 @@ unsigned long get_top_of_ram(void)
}
return (unsigned long) xdata;
}
-#endif
#endif