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/common/block | |
| 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/common/block')
| -rw-r--r-- | src/soc/intel/common/block/acpi/acpi.c | 4 | ||||
| -rw-r--r-- | src/soc/intel/common/block/pmc/pmclib.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/soc/intel/common/block/acpi/acpi.c b/src/soc/intel/common/block/acpi/acpi.c index 65e5f44685..cbc6a58a38 100644 --- a/src/soc/intel/common/block/acpi/acpi.c +++ b/src/soc/intel/common/block/acpi/acpi.c @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ #include <acpi/acpi_gnvs.h> +#include <acpi/acpi_pm.h> #include <acpi/acpigen.h> #include <arch/cpu.h> #include <arch/ioapic.h> #include <arch/smp/mpspec.h> #include <bootstate.h> -#include <cbmem.h> #include <cf9_reset.h> #include <console/console.h> #include <cpu/intel/turbo.h> @@ -213,7 +213,7 @@ static int acpi_fill_wake(uint32_t *pm1, uint32_t **gpe0) uint32_t pm1_en; int i; - ps = cbmem_find(CBMEM_ID_POWER_STATE); + ps = acpi_get_pm_state(); if (ps == NULL) return -1; diff --git a/src/soc/intel/common/block/pmc/pmclib.c b/src/soc/intel/common/block/pmc/pmclib.c index 09af749073..3b7aa0a169 100644 --- a/src/soc/intel/common/block/pmc/pmclib.c +++ b/src/soc/intel/common/block/pmc/pmclib.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#include <acpi/acpi_pm.h> #include <arch/io.h> #include <bootmode.h> #include <device/mmio.h> @@ -56,7 +57,7 @@ struct chipset_power_state *pmc_get_power_state(void) struct chipset_power_state *ptr = NULL; if (cbmem_possibly_online()) - ptr = cbmem_find(CBMEM_ID_POWER_STATE); + ptr = acpi_get_pm_state(); /* cbmem is online but ptr is not populated yet */ if (ptr == NULL && !(ENV_RAMSTAGE || ENV_POSTCAR)) |