GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ACPI: Drop some HAVE_ACPI_RESUME preprocessor use 

Change-Id: Idfb89ceabac6b6906e31a3dbe9096d48ba680599
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42458
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Furquan Shaikh <furquan@google.com>
This commit is contained in:
Kyösti Mälkki 2020-06-17 14:34:50 +03:00 committed by Angel Pons
parent df99d13f25
commit a9f881d039
4 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/drivers/intel/fsp1_1/raminit.c
View File

@ -145,12 +145,10 @@ void raminit(struct romstage_params *params)
fsp_reserved_bytes); fsp_reserved_bytes);
} else if (cbmem_initialize_id_size(CBMEM_ID_FSP_RESERVED_MEMORY, } else if (cbmem_initialize_id_size(CBMEM_ID_FSP_RESERVED_MEMORY,
fsp_reserved_bytes)) { fsp_reserved_bytes)) {
#if CONFIG(HAVE_ACPI_RESUME)
printk(BIOS_DEBUG, "Failed to recover CBMEM in S3 resume.\n"); printk(BIOS_DEBUG, "Failed to recover CBMEM in S3 resume.\n");
/* Failed S3 resume, reset to come up cleanly */ /* Failed S3 resume, reset to come up cleanly */
/* FIXME: A "system" reset is likely enough: */ /* FIXME: A "system" reset is likely enough: */
full_reset(); full_reset();
#endif
} }
/* Save the FSP runtime parameters. */ /* Save the FSP runtime parameters. */

2
src/soc/intel/baytrail/romstage/raminit.c
View File

@ -166,11 +166,9 @@ void raminit(struct mrc_params *mp, int prev_sleep_state)
if (prev_sleep_state != ACPI_S3) { if (prev_sleep_state != ACPI_S3) {
cbmem_initialize_empty(); cbmem_initialize_empty();
} else if (cbmem_initialize()) { } else if (cbmem_initialize()) {
#if CONFIG(HAVE_ACPI_RESUME)
printk(BIOS_DEBUG, "Failed to recover CBMEM in S3 resume.\n"); printk(BIOS_DEBUG, "Failed to recover CBMEM in S3 resume.\n");
/* Failed S3 resume, reset to come up cleanly */ /* Failed S3 resume, reset to come up cleanly */
system_reset(); system_reset();
#endif
} }
print_dram_info(mp->mainboard.dram_data[0]); print_dram_info(mp->mainboard.dram_data[0]);

2
src/soc/intel/broadwell/romstage/raminit.c
View File

@ -91,11 +91,9 @@ void raminit(struct pei_data *pei_data)
if (pei_data->boot_mode != ACPI_S3) { if (pei_data->boot_mode != ACPI_S3) {
cbmem_initialize_empty(); cbmem_initialize_empty();
} else if (cbmem_initialize()) { } else if (cbmem_initialize()) {
#if CONFIG(HAVE_ACPI_RESUME)
printk(BIOS_DEBUG, "Failed to recover CBMEM in S3 resume.\n"); printk(BIOS_DEBUG, "Failed to recover CBMEM in S3 resume.\n");
/* Failed S3 resume, reset to come up cleanly */ /* Failed S3 resume, reset to come up cleanly */
system_reset(); system_reset();
#endif
} }
printk(BIOS_DEBUG, "MRC data at %p %d bytes\n", pei_data->data_to_save, printk(BIOS_DEBUG, "MRC data at %p %d bytes\n", pei_data->data_to_save,

7
src/vendorcode/google/chromeos/elog.c
View File

@ -1,14 +1,11 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpi.h>
#include <bootstate.h> #include <bootstate.h>
#include <console/console.h> #include <console/console.h>
#include <elog.h> #include <elog.h>
#include <security/vboot/vboot_common.h> #include <security/vboot/vboot_common.h>
#if CONFIG(HAVE_ACPI_RESUME)
#include <acpi/acpi.h>
#endif
static void elog_add_boot_reason(void *unused) static void elog_add_boot_reason(void *unused)
{ {
int rec = vboot_recovery_mode_enabled(); int rec = vboot_recovery_mode_enabled();
@ -28,11 +25,9 @@ static void elog_add_boot_reason(void *unused)
if (dev) { if (dev) {
int log_event = 1; int log_event = 1;
#if CONFIG(HAVE_ACPI_RESUME)
/* Skip logging developer mode in ACPI resume path */ /* Skip logging developer mode in ACPI resume path */
if (acpi_is_wakeup()) if (acpi_is_wakeup())
log_event = 0; log_event = 0;
#endif
if (log_event) { if (log_event) {
elog_add_event(ELOG_TYPE_CROS_DEVELOPER_MODE); elog_add_event(ELOG_TYPE_CROS_DEVELOPER_MODE);