Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/50295 )
Change subject: soc/amd/stoneyridge: Create chipset_power_state in romstage ......................................................................
soc/amd/stoneyridge: Create chipset_power_state in romstage
Move chipset_power_state initialisation from early ramstage to romstage cbmem hook, like everyone else does.
Change-Id: Ib9189a70996ac6cf4515a0d504eb687941a6b5e0 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/soc/amd/stoneyridge/romstage.c M src/soc/amd/stoneyridge/southbridge.c 2 files changed, 13 insertions(+), 10 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/95/50295/1
diff --git a/src/soc/amd/stoneyridge/romstage.c b/src/soc/amd/stoneyridge/romstage.c index 3db7c42..e316d21 100644 --- a/src/soc/amd/stoneyridge/romstage.c +++ b/src/soc/amd/stoneyridge/romstage.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
+#include <amdblocks/acpi.h> #include <amdblocks/biosram.h> #include <device/pci_ops.h> #include <arch/cpu.h> @@ -204,3 +205,15 @@ platform->PlatStapmConfig.CfgStapmBoost = StapmBoostEnabled; } } + +static void migrate_power_state(int is_recovery) +{ + struct chipset_power_state *state; + state = cbmem_add(CBMEM_ID_POWER_STATE, sizeof(*state)); + if (state) { + acpi_fill_pm_gpe_state(&state->gpe_state); + acpi_pm_gpe_add_events_print_events(); + } + acpi_clear_pm_gpe_status(); +} +ROMSTAGE_CBMEM_INIT_HOOK(migrate_power_state) diff --git a/src/soc/amd/stoneyridge/southbridge.c b/src/soc/amd/stoneyridge/southbridge.c index 2a78ff9..c53bcf0 100644 --- a/src/soc/amd/stoneyridge/southbridge.c +++ b/src/soc/amd/stoneyridge/southbridge.c @@ -404,17 +404,7 @@
void fch_init(void *chip_info) { - struct chipset_power_state *state; - fch_init_acpi_ports(); - - state = cbmem_add(CBMEM_ID_POWER_STATE, sizeof(*state)); - if (state) { - acpi_fill_pm_gpe_state(&state->gpe_state); - acpi_pm_gpe_add_events_print_events(); - } - - acpi_clear_pm_gpe_status(); }
static void set_sb_aoac(struct aoac_devs *aoac)