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

drivers/intel/fsp1_1: align on using ACPI_Sx definitions 

The SLEEP_STATE_x definitions in the chipsets utilizing
FSP 1.1. driver have the exact same values as the ACPI_Sx
definitions. The chipsets will be moved over subsequently,
but updating this first allows the per-chipset patches
to be isolated.

BUG=chrome-os-partner:54977

Change-Id: I383a9a732ef68bf2276f6149ffa5360bcdfb70b3
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/15665
Tested-by: build bot (Jenkins)
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Lee Leahy <leroy.p.leahy@intel.com>
This commit is contained in:
Aaron Durbin 2016-07-13 23:09:52 -05:00
parent 9fe0ff2f83
commit 932e09d168
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,7 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <arch/acpi.h>
#include <cbmem.h> #include <cbmem.h>
#include <console/console.h> #include <console/console.h>
#include <fsp/memmap.h> #include <fsp/memmap.h>
@ -80,7 +81,7 @@ void raminit(struct romstage_params *params)
/* Zero fill RT Buffer data and start populating fields. */ /* Zero fill RT Buffer data and start populating fields. */
memset(&fsp_rt_common_buffer, 0, sizeof(fsp_rt_common_buffer)); memset(&fsp_rt_common_buffer, 0, sizeof(fsp_rt_common_buffer));
pei_ptr = params->pei_data; pei_ptr = params->pei_data;
if (pei_ptr->boot_mode == SLEEP_STATE_S3) { if (pei_ptr->boot_mode == ACPI_S3) {
fsp_rt_common_buffer.BootMode = BOOT_ON_S3_RESUME; fsp_rt_common_buffer.BootMode = BOOT_ON_S3_RESUME;
} else if (pei_ptr->saved_data != NULL) { } else if (pei_ptr->saved_data != NULL) {
fsp_rt_common_buffer.BootMode = fsp_rt_common_buffer.BootMode =
@ -156,7 +157,7 @@ void raminit(struct romstage_params *params)
/* Migrate CAR data */ /* Migrate CAR data */
printk(BIOS_DEBUG, "0x%p: cbmem_top\n", cbmem_top()); printk(BIOS_DEBUG, "0x%p: cbmem_top\n", cbmem_top());
if (pei_ptr->boot_mode != SLEEP_STATE_S3) { if (pei_ptr->boot_mode != ACPI_S3) {
cbmem_initialize_empty_id_size(CBMEM_ID_FSP_RESERVED_MEMORY, cbmem_initialize_empty_id_size(CBMEM_ID_FSP_RESERVED_MEMORY,
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,

13
src/drivers/intel/fsp1_1/romstage.c
View File

@ -15,6 +15,7 @@
*/ */
#include <stddef.h> #include <stddef.h>
#include <arch/acpi.h>
#include <arch/io.h> #include <arch/io.h>
#include <arch/cbfs.h> #include <arch/cbfs.h>
#include <arch/early_variables.h> #include <arch/early_variables.h>
@ -109,7 +110,7 @@ void romstage_common(struct romstage_params *params)
pei_data->boot_mode = params->power_state->prev_sleep_state; pei_data->boot_mode = params->power_state->prev_sleep_state;
#if IS_ENABLED(CONFIG_ELOG_BOOT_COUNT) #if IS_ENABLED(CONFIG_ELOG_BOOT_COUNT)
if (params->power_state->prev_sleep_state != SLEEP_STATE_S3) if (params->power_state->prev_sleep_state != ACPI_S3)
boot_count_increment(); boot_count_increment();
#endif #endif
@ -131,7 +132,7 @@ void romstage_common(struct romstage_params *params)
/* MRC cache found */ /* MRC cache found */
params->pei_data->saved_data_size = cache->size; params->pei_data->saved_data_size = cache->size;
params->pei_data->saved_data = &cache->data[0]; params->pei_data->saved_data = &cache->data[0];
} else if (params->pei_data->boot_mode == SLEEP_STATE_S3) { } else if (params->pei_data->boot_mode == ACPI_S3) {
/* Waking from S3 and no cache. */ /* Waking from S3 and no cache. */
printk(BIOS_DEBUG, printk(BIOS_DEBUG,
"No MRC cache found in S3 resume path.\n"); "No MRC cache found in S3 resume path.\n");
@ -151,7 +152,7 @@ void romstage_common(struct romstage_params *params)
if (IS_ENABLED(CONFIG_CACHE_MRC_SETTINGS)) { if (IS_ENABLED(CONFIG_CACHE_MRC_SETTINGS)) {
printk(BIOS_DEBUG, "MRC data at %p %d bytes\n", printk(BIOS_DEBUG, "MRC data at %p %d bytes\n",
pei_data->data_to_save, pei_data->data_to_save_size); pei_data->data_to_save, pei_data->data_to_save_size);
if ((params->pei_data->boot_mode != SLEEP_STATE_S3) if ((params->pei_data->boot_mode != ACPI_S3)
&& (params->pei_data->data_to_save_size != 0) && (params->pei_data->data_to_save_size != 0)
&& (params->pei_data->data_to_save != NULL)) && (params->pei_data->data_to_save != NULL))
mrc_cache_stash_data_with_version( mrc_cache_stash_data_with_version(
@ -167,7 +168,7 @@ void romstage_common(struct romstage_params *params)
handoff = romstage_handoff_find_or_add(); handoff = romstage_handoff_find_or_add();
if (handoff != NULL) if (handoff != NULL)
handoff->s3_resume = (params->power_state->prev_sleep_state == handoff->s3_resume = (params->power_state->prev_sleep_state ==
SLEEP_STATE_S3); ACPI_S3);
else { else {
printk(BIOS_DEBUG, "Romstage handoff structure not added!\n"); printk(BIOS_DEBUG, "Romstage handoff structure not added!\n");
hard_reset(); hard_reset();
@ -181,7 +182,7 @@ void romstage_common(struct romstage_params *params)
!IS_ENABLED(CONFIG_RESUME_PATH_SAME_AS_BOOT) && !IS_ENABLED(CONFIG_RESUME_PATH_SAME_AS_BOOT) &&
!IS_ENABLED(CONFIG_VBOOT_STARTS_IN_BOOTBLOCK)) !IS_ENABLED(CONFIG_VBOOT_STARTS_IN_BOOTBLOCK))
init_tpm(params->power_state->prev_sleep_state == init_tpm(params->power_state->prev_sleep_state ==
SLEEP_STATE_S3); ACPI_S3);
} }
void after_cache_as_ram_stage(void) void after_cache_as_ram_stage(void)
@ -204,7 +205,7 @@ __attribute__((weak)) void mainboard_check_ec_image(
struct pei_data *pei_data; struct pei_data *pei_data;
pei_data = params->pei_data; pei_data = params->pei_data;
if (params->pei_data->boot_mode == SLEEP_STATE_S0) { if (params->pei_data->boot_mode == ACPI_S0) {
/* Ensure EC is running RO firmware. */ /* Ensure EC is running RO firmware. */
google_chromeec_check_ec_image(EC_IMAGE_RO); google_chromeec_check_ec_image(EC_IMAGE_RO);
} }