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 <aamir.bohra@intel.com>
Reviewed-on: https://review.coreboot.org/22985
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c
index 039dafe..7b03104 100644
--- a/src/drivers/intel/fsp2_0/memory_init.c
+++ b/src/drivers/intel/fsp2_0/memory_init.c
@@ -279,6 +279,19 @@
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;
}