[coreboot-gerrit] Change in coreboot[master]: ACPI: Drop some HAVE_ACPI_RESUME preprocessor use

[Angel Pons (Code Review)]

Angel Pons has submitted this change. ( https://review.coreboot.org/c/coreboot/+/42458 )

Change subject: ACPI: Drop some HAVE_ACPI_RESUME preprocessor use
......................................................................

ACPI: Drop some HAVE_ACPI_RESUME preprocessor use

Change-Id: Idfb89ceabac6b6906e31a3dbe9096d48ba680599
Signed-off-by: Kyösti Mälkki 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42458
Tested-by: build bot (Jenkins) 
Reviewed-by: Angel Pons 
Reviewed-by: Furquan Shaikh 
---
M src/drivers/intel/fsp1_1/raminit.c
M src/soc/intel/baytrail/romstage/raminit.c
M src/soc/intel/broadwell/romstage/raminit.c
M src/vendorcode/google/chromeos/elog.c
4 files changed, 1 insertion(+), 12 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Furquan Shaikh: Looks good to me, approved
  Angel Pons: Looks good to me, approved

diff --git a/src/drivers/intel/fsp1_1/raminit.c b/src/drivers/intel/fsp1_1/raminit.c
index dfa3258..dd08d77 100644
--- a/src/drivers/intel/fsp1_1/raminit.c
+++ b/src/drivers/intel/fsp1_1/raminit.c
@@ -145,12 +145,10 @@
    		fsp_reserved_bytes);
    } else if (cbmem_initialize_id_size(CBMEM_ID_FSP_RESERVED_MEMORY,
    	fsp_reserved_bytes)) {
-#if CONFIG(HAVE_ACPI_RESUME)
    	printk(BIOS_DEBUG, "Failed to recover CBMEM in S3 resume.\n");
    	/* Failed S3 resume, reset to come up cleanly */
    	/* FIXME: A "system" reset is likely enough: */
    	full_reset();
-#endif
    }

/* Save the FSP runtime parameters. */
diff --git a/src/soc/intel/baytrail/romstage/raminit.c b/src/soc/intel/baytrail/romstage/raminit.c
index 1d1bd30..5cedf22 100644
--- a/src/soc/intel/baytrail/romstage/raminit.c
+++ b/src/soc/intel/baytrail/romstage/raminit.c
@@ -166,11 +166,9 @@
    if (prev_sleep_state != ACPI_S3) {
    	cbmem_initialize_empty();
    } else if (cbmem_initialize()) {
-	#if CONFIG(HAVE_ACPI_RESUME)
    	printk(BIOS_DEBUG, "Failed to recover CBMEM in S3 resume.\n");
    	/* Failed S3 resume, reset to come up cleanly */
    	system_reset();
-	#endif
    }

print_dram_info(mp->mainboard.dram_data[0]);
diff --git a/src/soc/intel/broadwell/romstage/raminit.c b/src/soc/intel/broadwell/romstage/raminit.c
index 8c194fc..4165c67 100644
--- a/src/soc/intel/broadwell/romstage/raminit.c
+++ b/src/soc/intel/broadwell/romstage/raminit.c
@@ -91,11 +91,9 @@
    if (pei_data->boot_mode != ACPI_S3) {
    	cbmem_initialize_empty();
    } else if (cbmem_initialize()) {
-#if CONFIG(HAVE_ACPI_RESUME)
    	printk(BIOS_DEBUG, "Failed to recover CBMEM in S3 resume.\n");
    	/* Failed S3 resume, reset to come up cleanly */
    	system_reset();
-#endif
    }

printk(BIOS_DEBUG, "MRC data at %p %d bytes\n", pei_data->data_to_save,
diff --git a/src/vendorcode/google/chromeos/elog.c b/src/vendorcode/google/chromeos/elog.c
index 14163a5..4dd8b19 100644
--- a/src/vendorcode/google/chromeos/elog.c
+++ b/src/vendorcode/google/chromeos/elog.c
@@ -1,14 +1,11 @@
 /* SPDX-License-Identifier: GPL-2.0-only */

+#include <acpi/acpi.h>
 #include <bootstate.h>
 #include <console/console.h>
 #include <elog.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)
 {
    int rec = vboot_recovery_mode_enabled();
@@ -28,11 +25,9 @@
    if (dev) {
    	int log_event = 1;

-#if CONFIG(HAVE_ACPI_RESUME)
    	/* Skip logging developer mode in ACPI resume path */
    	if (acpi_is_wakeup())
    		log_event = 0;
-#endif

if (log_event) {
    		elog_add_event(ELOG_TYPE_CROS_DEVELOPER_MODE);