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/baytrail | |
| 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/baytrail')
| -rw-r--r-- | src/soc/intel/baytrail/elog.c | 9 | ||||
| -rw-r--r-- | src/soc/intel/baytrail/pmutil.c | 4 | ||||
| -rw-r--r-- | src/soc/intel/baytrail/ramstage.c | 4 |
3 files changed, 7 insertions, 10 deletions
diff --git a/src/soc/intel/baytrail/elog.c b/src/soc/intel/baytrail/elog.c index 7e92e9037d..b299c37218 100644 --- a/src/soc/intel/baytrail/elog.c +++ b/src/soc/intel/baytrail/elog.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include <acpi/acpi.h> -#include <cbmem.h> +#include <acpi/acpi_pm.h> #include <console/console.h> #include <device/device.h> #include <device/pci.h> @@ -76,13 +76,10 @@ static void log_wake_events(const struct chipset_power_state *ps) void southcluster_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_DEBUG, - "Not logging power state information. Power state not found in cbmem.\n"); + if (acpi_pm_state_for_elog(&ps) < 0) return; - } log_power_and_resets(ps); log_wake_events(ps); diff --git a/src/soc/intel/baytrail/pmutil.c b/src/soc/intel/baytrail/pmutil.c index cc1dd42fc5..7ab61ac7cf 100644 --- a/src/soc/intel/baytrail/pmutil.c +++ b/src/soc/intel/baytrail/pmutil.c @@ -2,13 +2,13 @@ #include <stdint.h> #include <acpi/acpi.h> +#include <acpi/acpi_pm.h> #include <arch/io.h> #include <bootmode.h> #include <device/device.h> #include <device/mmio.h> #include <device/pci.h> #include <device/pci_ops.h> -#include <cbmem.h> #include <console/console.h> #include <soc/iomap.h> @@ -349,7 +349,7 @@ int rtc_failure(void) { uint32_t gen_pmcon1; int rtc_fail; - struct chipset_power_state *ps = cbmem_find(CBMEM_ID_POWER_STATE); + struct chipset_power_state *ps = acpi_get_pm_state(); if (ps != NULL) gen_pmcon1 = ps->gen_pmcon1; diff --git a/src/soc/intel/baytrail/ramstage.c b/src/soc/intel/baytrail/ramstage.c index 1e7cc089a0..0c955e3073 100644 --- a/src/soc/intel/baytrail/ramstage.c +++ b/src/soc/intel/baytrail/ramstage.c @@ -3,7 +3,7 @@ #include <arch/cpu.h> #include <acpi/acpi.h> #include <acpi/acpi_gnvs.h> -#include <cbmem.h> +#include <acpi/acpi_pm.h> #include <console/console.h> #include <cpu/intel/microcode.h> #include <cpu/x86/cr.h> @@ -119,7 +119,7 @@ static void fill_in_pattrs(void) /* Save bit index for first enabled event in PM1_STS for \_SB._SWS */ static void save_acpi_wake_source(void) { - struct chipset_power_state *ps = cbmem_find(CBMEM_ID_POWER_STATE); + struct chipset_power_state *ps = acpi_get_pm_state(); struct global_nvs *gnvs = acpi_get_gnvs(); uint16_t pm1; |