diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2021-01-21 16:05:26 +0200 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2021-01-23 20:31:09 +0000 |
| commit | 2787237dd52550b5d7e1dc3dabcf380126ff804c (patch) | |
| tree | 33cbe7d7d77d20fa4c142c8af7a5ffb82d78cd56 /src/soc/intel/apollolake | |
| parent | 10f7f997ad439681b959962682cafc1993677c56 (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/apollolake')
| -rw-r--r-- | src/soc/intel/apollolake/elog.c | 10 | ||||
| -rw-r--r-- | src/soc/intel/apollolake/pmutil.c | 8 |
2 files changed, 6 insertions, 12 deletions
diff --git a/src/soc/intel/apollolake/elog.c b/src/soc/intel/apollolake/elog.c index d17d407413..47b68f1489 100644 --- a/src/soc/intel/apollolake/elog.c +++ b/src/soc/intel/apollolake/elog.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include <cbmem.h> +#include <acpi/acpi_pm.h> #include <console/console.h> #include <device/pci_type.h> #include <elog.h> @@ -88,14 +88,10 @@ static void pch_log_power_and_resets(const struct chipset_power_state *ps) void pch_log_state(void) { - struct chipset_power_state *ps = cbmem_find(CBMEM_ID_POWER_STATE); + const struct chipset_power_state *ps; - if (ps == NULL) { - printk(BIOS_ERR, - "Not logging power state information. " - "Power state not found in cbmem.\n"); + if (acpi_pm_state_for_elog(&ps) < 0) return; - } /* Power and Reset */ pch_log_power_and_resets(ps); diff --git a/src/soc/intel/apollolake/pmutil.c b/src/soc/intel/apollolake/pmutil.c index 6e96b57a07..1d4a55835e 100644 --- a/src/soc/intel/apollolake/pmutil.c +++ b/src/soc/intel/apollolake/pmutil.c @@ -3,9 +3,9 @@ #define __SIMPLE_DEVICE__ #include <acpi/acpi.h> +#include <acpi/acpi_pm.h> #include <arch/io.h> #include <device/mmio.h> -#include <cbmem.h> #include <console/console.h> #include <cpu/x86/msr.h> #include <device/device.h> @@ -185,12 +185,10 @@ static int rtc_failed(uint32_t gen_pmcon1) 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_pmcon1); } |