Aaron Durbin (adurbin@google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5010
-gerrit
commit 7d355c15ab3a73673c63fdf1b4fd2ce4d4586a3f Author: Aaron Durbin adurbin@chromium.org Date: Thu Dec 12 10:07:00 2013 -0800
baytrail: note S3 resume status earlier
Certain code paths want to know if S3 resume is happening. However, the current baytrail code doesn't note S3 resume early enough. Therefore, mark S3 resume just after pattr setup.
BUG=chrome-os-partner:22867 BRANCH=None TEST=Built and booted. S3 resumed.
Change-Id: I5e5cc285940e4567521afb8483614ce6f813ddde Signed-off-by: Aaron Durbin adurbin@chromium.org Reviewed-on: https://chromium-review.googlesource.com/179774 Reviewed-by: Duncan Laurie dlaurie@chromium.org --- src/soc/intel/baytrail/ramstage.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/soc/intel/baytrail/ramstage.c b/src/soc/intel/baytrail/ramstage.c index b0b48b0..9fe6c27 100644 --- a/src/soc/intel/baytrail/ramstage.c +++ b/src/soc/intel/baytrail/ramstage.c @@ -159,6 +159,9 @@ void baytrail_init_pre_device(void) /* Allow for SSE instructions to be executed. */ write_cr4(read_cr4() | CR4_OSFXSR | CR4_OSXMMEXCPT);
+ /* Indicate S3 resume to rest of ramstage. */ + s3_resume_prepare(); + /* Run reference code. */ baytrail_run_reference_code();
@@ -167,7 +170,4 @@ void baytrail_init_pre_device(void) setup_soc_gpios(config);
baytrail_init_scc(); - - /* Indicate S3 resume to rest of ramstage. */ - s3_resume_prepare(); }