summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/soc/amd/common/block/acpi/acpi.c8
-rw-r--r--src/soc/amd/stoneyridge/sb_util.c5
2 files changed, 6 insertions, 7 deletions
diff --git a/src/soc/amd/common/block/acpi/acpi.c b/src/soc/amd/common/block/acpi/acpi.c
index 39e03e2c0c..e18933bb81 100644
--- a/src/soc/amd/common/block/acpi/acpi.c
+++ b/src/soc/amd/common/block/acpi/acpi.c
@@ -132,13 +132,17 @@ void acpi_clear_pm1_status(void)
print_pm1_status(pm1_sts);
}
+int acpi_get_sleep_type(void)
+{
+ return acpi_sleep_from_pm1(acpi_read16(MMIO_ACPI_PM1_CNT_BLK));
+}
+
int vboot_platform_is_resuming(void)
{
if (!(acpi_read16(MMIO_ACPI_PM1_STS) & WAK_STS))
return 0;
- uint16_t pm_cnt = acpi_read16(MMIO_ACPI_PM1_CNT_BLK);
- return acpi_sleep_from_pm1(pm_cnt) == ACPI_S3;
+ return acpi_get_sleep_type() == ACPI_S3;
}
/* If a system reset is about to be requested, modify the PM1 register so it
diff --git a/src/soc/amd/stoneyridge/sb_util.c b/src/soc/amd/stoneyridge/sb_util.c
index 11bf73a723..7869065237 100644
--- a/src/soc/amd/stoneyridge/sb_util.c
+++ b/src/soc/amd/stoneyridge/sb_util.c
@@ -29,11 +29,6 @@ uint16_t pm_acpi_pm_evt_blk(void)
return pm_read16(PM_EVT_BLK);
}
-int acpi_get_sleep_type(void)
-{
- return acpi_sleep_from_pm1(inw(pm_acpi_pm_cnt_blk()));
-}
-
void save_uma_size(uint32_t size)
{
biosram_write32(BIOSRAM_UMA_SIZE, size);