summaryrefslogtreecommitdiff
path: root/src/soc/intel/cannonlake
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2021-01-21 16:05:26 +0200
committerFelix Held <felix-coreboot@felixheld.de>2021-01-23 20:31:09 +0000
commit2787237dd52550b5d7e1dc3dabcf380126ff804c (patch)
tree33cbe7d7d77d20fa4c142c8af7a5ffb82d78cd56 /src/soc/intel/cannonlake
parent10f7f997ad439681b959962682cafc1993677c56 (diff)
ACPI: Add helpers for CBMEM_ID_POWER_STATE
Create uniform logging for the (unlikely) case of a CBMEM entry disappearing. Change-Id: I7c5414a03d869423c8ae5192a990fde5f9582f2d Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/49817 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Diffstat (limited to 'src/soc/intel/cannonlake')
-rw-r--r--src/soc/intel/cannonlake/pmutil.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/soc/intel/cannonlake/pmutil.c b/src/soc/intel/cannonlake/pmutil.c
index 785283cee2..b2dbfbe6d0 100644
--- a/src/soc/intel/cannonlake/pmutil.c
+++ b/src/soc/intel/cannonlake/pmutil.c
@@ -7,8 +7,8 @@
#define __SIMPLE_DEVICE__
+#include <acpi/acpi_pm.h>
#include <device/mmio.h>
-#include <cbmem.h>
#include <device/device.h>
#include <device/pci.h>
#include <device/pci_def.h>
@@ -180,12 +180,10 @@ static int rtc_failed(uint32_t gen_pmcon_b)
int soc_get_rtc_failed(void)
{
- const struct chipset_power_state *ps = cbmem_find(CBMEM_ID_POWER_STATE);
+ const struct chipset_power_state *ps;
- if (!ps) {
- printk(BIOS_ERR, "Could not find power state in cbmem, RTC init aborted\n");
+ if (acpi_pm_state_for_rtc(&ps) < 0)
return 1;
- }
return rtc_failed(ps->gen_pmcon_b);
}