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

soc/intel/baytrail: Use cbmem_recovery() 

For consistency with other soc/intel add s3resume variable,
this helps towards unified chipset_power_state.

Change-Id: Ida04d2292aabb5a366f3400d8596ede0dee64839
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50969
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Kyösti Mälkki 2021-02-17 17:33:17 +02:00
parent 6ceec167f5
commit c5c3e3c594
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,6 +129,8 @@ void raminit(struct mrc_params *mp, int prev_sleep_state)
mp->prev_sleep_state = prev_sleep_state; mp->prev_sleep_state = prev_sleep_state;
mp->rmt_enabled = CONFIG(MRC_RMT); mp->rmt_enabled = CONFIG(MRC_RMT);
int s3resume = prev_sleep_state == ACPI_S3;
/* Default to 2GiB IO hole. */ /* Default to 2GiB IO hole. */
if (!mp->io_hole_mb) if (!mp->io_hole_mb)
mp->io_hole_mb = 2048; mp->io_hole_mb = 2048;
@ -141,7 +143,7 @@ void raminit(struct mrc_params *mp, int prev_sleep_state)
&mrc_size); &mrc_size);
if (mp->saved_data) { if (mp->saved_data) {
mp->saved_data_size = mrc_size; mp->saved_data_size = mrc_size;
} else if (prev_sleep_state == ACPI_S3) { } else if (s3resume) {
/* If waking from S3 and no cache then. */ /* If waking from S3 and no cache then. */
printk(BIOS_DEBUG, "No MRC cache found in S3 resume path.\n"); printk(BIOS_DEBUG, "No MRC cache found in S3 resume path.\n");
post_code(POST_RESUME_FAILURE); post_code(POST_RESUME_FAILURE);
@ -180,11 +182,10 @@ void raminit(struct mrc_params *mp, int prev_sleep_state)
ret = mrc_entry(mp); ret = mrc_entry(mp);
if (prev_sleep_state != ACPI_S3) { int cbmem_was_initted = !cbmem_recovery(s3resume);
cbmem_initialize_empty(); if (s3resume && !cbmem_was_initted) {
} else if (cbmem_initialize()) {
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 */
printk(BIOS_CRIT, "Failed to recover CBMEM in S3 resume.\n");
system_reset(); system_reset();
} }