summaryrefslogtreecommitdiff
path: root/src/soc/intel
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2013-12-12 10:07:00 -0800
committerKyösti Mälkki <kyosti.malkki@gmail.com>2014-05-10 06:31:37 +0200
commit7d34c6070b8fc2e8dc2f5274794e2374a883d4ce (patch)
tree9a2074b332770fac8842886f9293050024dac8d4 /src/soc/intel
parent616f394d3656760deb1e048c0dde4fe3aaa6607f (diff)
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> Reviewed-on: http://review.coreboot.org/5010 Tested-by: build bot (Jenkins) Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Diffstat (limited to 'src/soc/intel')
-rw-r--r--src/soc/intel/baytrail/ramstage.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/soc/intel/baytrail/ramstage.c b/src/soc/intel/baytrail/ramstage.c
index b0b48b0eaa..9fe6c27dfe 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();
}