From 276c06a2f5af4846ecbf21a813f46fac515f4316 Mon Sep 17 00:00:00 2001 From: Aamir Bohra Date: Tue, 26 Dec 2017 17:54:45 +0530 Subject: intel/fsp2_0: Issue hard reset in S3 resume for invalid mrc cache data In S3 resume, for cases if valid mrc cache data is not found or RECOVERY_MRC_CACHE hash verification fails, the S3 data pointer would be null and bootmode is set to BOOT_WITH_FULL_CONFIGURATION. This gets memory to be retrained in S3 flow. Data context including that of imdr root pointer would be lost, invoking a hard reset in romstage post memory init. Issuing hard reset before memory init, saves fsp memory initialization and training overhead. BUG=b:70973961 BRANCH=None TEST=Verify S3 resume flows on soraka. Change-Id: Ibd6d66793ed57c2596d9628c826f6ad198aad58b Signed-off-by: Aamir Bohra Reviewed-on: https://review.coreboot.org/22985 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh Reviewed-by: Subrata Banik Reviewed-by: Aaron Durbin --- src/drivers/intel/fsp2_0/memory_init.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'src/drivers/intel/fsp2_0') diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c index 039dafec8e..7b031040c8 100644 --- a/src/drivers/intel/fsp2_0/memory_init.c +++ b/src/drivers/intel/fsp2_0/memory_init.c @@ -279,6 +279,19 @@ static enum cb_err fsp_fill_common_arch_params(FSPM_ARCH_UPD *arch_upd, fsp_fill_mrc_cache(arch_upd, s3wake, fsp_version); + /* + * For S3 resume case, if valid mrc cache data is not found + * or RECOVERY_MRC_CACHE hash verification fails, the S3 data + * pointer would be null and Bootmode is set to + * BOOT_WITH_FULL_CONFIGURATION. This gets memory to be retrained + * in S3 flow. Data context including that of imdr root pointer would + * be lost, invoking a hard reset in romstage post memory init. + * Issuing hard reset here, saves fsp memory initialization and + * training overhead. + */ + if (s3wake && !arch_upd->NvsBufferPtr) + hard_reset(); + return CB_SUCCESS; } -- cgit v1.2.3