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

haswell: move call site of save_mrc_data() 

The save_mrc_data() was previously called conditionally
in the raminit code. The save_mrc_data() function was called
in the non-S3 wake paths. However, the common romstage_common()
code was checking cbmem initialization things on s3 wake. Between
the two callers cbmem_initialize() was being called twice in the
non-s3 wake paths.  Moreover, saving of the mrc data was not allowed
when CONFIG_EARLY_CBMEM_INIT wasn't enabled.

Therefore, move the save_mrc_data() to romstage_common. It already has
the knowledge of the wake path. Also remove the CONFIG_EARLY_CBMEM_INIT
requirement from save_mrc_data() as well as the call to cbmem_initialize().

Change-Id: I7f0e4d752c92d9d5eedb8fa56133ec190caf77da
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/2756
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
Aaron Durbin 2013-02-07 00:51:18 -06:00 committed by Ronald G. Minnich
parent 38d9423dbe
commit 2ad1dbaf2a
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpu/intel/haswell/romstage.c
View File

@ -230,6 +230,10 @@ void romstage_common(const struct romstage_params *params)
- HIGH_MEMORY_SIZE)); - HIGH_MEMORY_SIZE));
#endif #endif
/* Save data returned from MRC on non-S3 resumes. */
if (boot_mode != 2)
save_mrc_data(params->pei_data);
#if CONFIG_HAVE_ACPI_RESUME #if CONFIG_HAVE_ACPI_RESUME
/* If there is no high memory area, we didn't boot before, so /* If there is no high memory area, we didn't boot before, so
* this is not a resume. In that case we just create the cbmem toc. * this is not a resume. In that case we just create the cbmem toc.

9
src/northbridge/intel/haswell/raminit.c
View File

@ -38,14 +38,12 @@
#define recovery_mode_enabled(x) 0 #define recovery_mode_enabled(x) 0
#endif #endif
static void save_mrc_data(struct pei_data *pei_data) void save_mrc_data(struct pei_data *pei_data)
{ {
#if CONFIG_EARLY_CBMEM_INIT
struct mrc_data_container *mrcdata; struct mrc_data_container *mrcdata;
int output_len = ALIGN(pei_data->mrc_output_len, 16); int output_len = ALIGN(pei_data->mrc_output_len, 16);
/* Save the MRC S3 restore data to cbmem */ /* Save the MRC S3 restore data to cbmem */
cbmem_initialize();
mrcdata = cbmem_add mrcdata = cbmem_add
(CBMEM_ID_MRCDATA, (CBMEM_ID_MRCDATA,
output_len + sizeof(struct mrc_data_container)); output_len + sizeof(struct mrc_data_container));
@ -66,7 +64,6 @@ static void save_mrc_data(struct pei_data *pei_data)
mrcdata->mrc_checksum = compute_ip_checksum(mrcdata->mrc_data, mrcdata->mrc_checksum = compute_ip_checksum(mrcdata->mrc_data,
mrcdata->mrc_data_size); mrcdata->mrc_data_size);
#endif
} }
static void prepare_mrc_cache(struct pei_data *pei_data) static void prepare_mrc_cache(struct pei_data *pei_data)
@ -204,10 +201,6 @@ void sdram_initialize(struct pei_data *pei_data)
(version >> 8) & 0xff, version & 0xff); (version >> 8) & 0xff, version & 0xff);
report_memory_config(); report_memory_config();
/* S3 resume: don't save scrambler seed or MRC data */
if (pei_data->boot_mode != 2)
save_mrc_data(pei_data);
} }
struct cbmem_entry *get_cbmem_toc(void) struct cbmem_entry *get_cbmem_toc(void)

2
src/northbridge/intel/haswell/raminit.h
View File

@ -25,5 +25,7 @@
void sdram_initialize(struct pei_data *pei_data); void sdram_initialize(struct pei_data *pei_data);
unsigned long get_top_of_ram(void); unsigned long get_top_of_ram(void);
int fixup_haswell_errata(void); int fixup_haswell_errata(void);
/* save_mrc_data() must be called after cbmem has been initialized. */
void save_mrc_data(struct pei_data *pei_data);
#endif /* RAMINIT_H */ #endif /* RAMINIT_H */