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/amd | |
| 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/amd')
| -rw-r--r-- | src/soc/amd/common/block/acpi/pm_state.c | 4 | ||||
| -rw-r--r-- | src/soc/amd/picasso/fch.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/soc/amd/common/block/acpi/pm_state.c b/src/soc/amd/common/block/acpi/pm_state.c index 1a1c9b218b..ed97afbcf5 100644 --- a/src/soc/amd/common/block/acpi/pm_state.c +++ b/src/soc/amd/common/block/acpi/pm_state.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include <acpi/acpi_gnvs.h> +#include <acpi/acpi_pm.h> #include <bootstate.h> -#include <cbmem.h> #include <soc/acpi.h> #include <soc/nvs.h> #include <soc/southbridge.h> @@ -53,7 +53,7 @@ static void set_nvs_sws(void *unused) { struct chipset_power_state *state; - state = cbmem_find(CBMEM_ID_POWER_STATE); + state = acpi_get_pm_state(); if (state == NULL) return; diff --git a/src/soc/amd/picasso/fch.c b/src/soc/amd/picasso/fch.c index 730e636e57..d9a18e1cd2 100644 --- a/src/soc/amd/picasso/fch.c +++ b/src/soc/amd/picasso/fch.c @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#include <acpi/acpi_gnvs.h> +#include <acpi/acpi_pm.h> #include <console/console.h> #include <device/mmio.h> #include <bootstate.h> @@ -9,8 +11,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ops.h> -#include <cbmem.h> -#include <acpi/acpi_gnvs.h> #include <amdblocks/amd_pci_util.h> #include <amdblocks/reset.h> #include <amdblocks/acpimmio.h> @@ -210,7 +210,7 @@ void southbridge_init(void *chip_info) i2c_soc_init(); sb_init_acpi_ports(); - state = cbmem_find(CBMEM_ID_POWER_STATE); + state = acpi_get_pm_state(); if (state) { acpi_pm_gpe_add_events_print_events(&state->gpe_state); gpio_add_events(&state->gpio_state); |