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

intel/fsp1_1: Don't consume FSP_SMBIOS_MEMORY_INFO_HOB in S3 resume path 

FSP doesn't publish smbios_memory_info_guid during S3 resume
path. Hence it's recommended to skip consuming this HOB in
S3 resume.

Bug=none
Branch=none
TEST=Build and boot Lars system with this patch.

Change-Id: I321751523b1ea3326ffc23f4d4c53d5362482674
Signed-off-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-on: https://review.coreboot.org/20540
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Subrata Banik 2017-07-12 15:13:53 +05:30 committed by Martin Roth
parent b5a5aa6450
commit 0beac81f64
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,6 +101,7 @@ void *cache_as_ram_stage_main(FSP_INFO_HEADER *fih)
/* Entry from the mainboard. */ /* Entry from the mainboard. */
void romstage_common(struct romstage_params *params) void romstage_common(struct romstage_params *params)
{ {
bool s3wake;
struct region_device rdev; struct region_device rdev;
struct pei_data *pei_data; struct pei_data *pei_data;
@ -110,11 +111,10 @@ void romstage_common(struct romstage_params *params)
pei_data = params->pei_data; pei_data = params->pei_data;
pei_data->boot_mode = params->power_state->prev_sleep_state; pei_data->boot_mode = params->power_state->prev_sleep_state;
s3wake = params->power_state->prev_sleep_state == ACPI_S3;
#if IS_ENABLED(CONFIG_ELOG_BOOT_COUNT) if (IS_ENABLED(CONFIG_ELOG_BOOT_COUNT) && !s3wake)
if (params->power_state->prev_sleep_state != ACPI_S3)
boot_count_increment(); boot_count_increment();
#endif
/* Perform remaining SOC initialization */ /* Perform remaining SOC initialization */
soc_pre_ram_init(params); soc_pre_ram_init(params);
@ -168,7 +168,8 @@ void romstage_common(struct romstage_params *params)
} }
/* Save DIMM information */ /* Save DIMM information */
mainboard_save_dimm_info(params); if (!s3wake)
mainboard_save_dimm_info(params);
/* Create romstage handof information */ /* Create romstage handof information */
if (romstage_handoff_init( if (romstage_handoff_init(