diff options
| author | li-elvin <li-elvin@6f19259b-4bc3-4df7-8a09-765794883524> | 2012-11-07 04:44:04 +0000 |
|---|---|---|
| committer | li-elvin <li-elvin@6f19259b-4bc3-4df7-8a09-765794883524> | 2012-11-07 04:44:04 +0000 |
| commit | 17dd0f2bb10c0ff90c794a8e4f1a966360da7c6d (patch) | |
| tree | 355515a925facc406b8595baccd9edd5b65d4d67 /MdeModulePkg/Universal | |
| parent | 8c3883b68d1696c2f151d03fdce83c247526c16d (diff) | |
| download | edk2-17dd0f2bb10c0ff90c794a8e4f1a966360da7c6d.zip edk2-17dd0f2bb10c0ff90c794a8e4f1a966360da7c6d.tar.gz edk2-17dd0f2bb10c0ff90c794a8e4f1a966360da7c6d.tar.bz2 | |
Moved the PeiS3ResumeState access when PeiS3ResumeState is not 0, this will fix K9 error.
Signed-off-by: Li Elvin <elvin.li@intel.com>
Reviewed-by: Yao Jiewen <jiewen.yao@intel.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13929 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg/Universal')
| -rw-r--r-- | MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c index 3bddda1..e671164 100644 --- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c +++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c @@ -69,12 +69,6 @@ S3BootScriptExecutorEntryFunction ( //
Status = S3BootScriptExecute ();
- //
- // Need report status back to S3ResumePeim.
- // If boot script execution is failed, S3ResumePeim wil report the error status code.
- //
- PeiS3ResumeState->ReturnStatus = (UINT64)(UINTN)Status;
-
AsmWbinvd ();
//
@@ -86,6 +80,11 @@ S3BootScriptExecutorEntryFunction ( // We need turn back to S3Resume - install boot script done ppi and report status code on S3resume.
//
if (PeiS3ResumeState != 0) {
+ //
+ // Need report status back to S3ResumePeim.
+ // If boot script execution is failed, S3ResumePeim wil report the error status code.
+ //
+ PeiS3ResumeState->ReturnStatus = (UINT64)(UINTN)Status;
if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) {
//
// X64 S3 Resume
|