mirror of https://github.com/acidanthera/audk.git
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
This commit is contained in:
parent
8c3883b68d
commit
17dd0f2bb1
|
@ -69,12 +69,6 @@ S3BootScriptExecutorEntryFunction (
|
||||||
//
|
//
|
||||||
Status = S3BootScriptExecute ();
|
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 ();
|
AsmWbinvd ();
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -86,6 +80,11 @@ S3BootScriptExecutorEntryFunction (
|
||||||
// We need turn back to S3Resume - install boot script done ppi and report status code on S3resume.
|
// We need turn back to S3Resume - install boot script done ppi and report status code on S3resume.
|
||||||
//
|
//
|
||||||
if (PeiS3ResumeState != 0) {
|
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)) {
|
if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) {
|
||||||
//
|
//
|
||||||
// X64 S3 Resume
|
// X64 S3 Resume
|
||||||
|
|
Loading…
Reference in New Issue