summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarshall Dawson <marshalldawson3rd@gmail.com>2019-05-03 13:06:55 -0600
committerMartin Roth <martinroth@google.com>2019-06-06 18:52:21 +0000
commit26307c738537d4491f23c06bf00f7bcf29802223 (patch)
tree1f9bee1e08f5892981b6c5118a79c20a2b8fa56b /src
parentec63a7140a3326fa177114a7253c74039ab07454 (diff)
downloadcoreboot-26307c738537d4491f23c06bf00f7bcf29802223.tar.xz
soc/amd/stoneyridge: Relocate acpi_get_sleep_type()
Move the function into common code. Convert it to use the memory- mapped access type. Convert vboot_platform_is_resuming() to call it instead of duplicating the source. BUG=b:131682806 Change-Id: I245bebb8dc2d331cdd56acfb245a004536b792ab Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/32658 Reviewed-by: Furquan Shaikh <furquan@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src')
-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);