tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Initialize TempAcpiS3Context and TempEfiBootScriptExecutorVariable. 

Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13649 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lzeng14 2012-08-20 06:09:25 +00:00
parent 6d4136f4b0
commit 48ee8e3e8c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
View File

@ -874,6 +874,9 @@ S3RestoreConfig2 (
VOID *GuidHob; VOID *GuidHob;
BOOLEAN Build4GPageTableOnly; BOOLEAN Build4GPageTableOnly;
TempAcpiS3Context = 0;
TempEfiBootScriptExecutorVariable = 0;
DEBUG ((EFI_D_ERROR, "Enter S3 PEIM\r\n")); DEBUG ((EFI_D_ERROR, "Enter S3 PEIM\r\n"));
VarSize = sizeof (EFI_PHYSICAL_ADDRESS); VarSize = sizeof (EFI_PHYSICAL_ADDRESS);
@ -884,9 +887,6 @@ S3RestoreConfig2 (
); );
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
AcpiS3Context = (ACPI_S3_CONTEXT *)(UINTN)TempAcpiS3Context;
ASSERT (AcpiS3Context != NULL);
Status = RestoreLockBox ( Status = RestoreLockBox (
&gEfiAcpiS3ContextGuid, &gEfiAcpiS3ContextGuid,
NULL, NULL,
@ -894,7 +894,10 @@ S3RestoreConfig2 (
); );
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
VarSize = sizeof (TempEfiBootScriptExecutorVariable); AcpiS3Context = (ACPI_S3_CONTEXT *)(UINTN)TempAcpiS3Context;
ASSERT (AcpiS3Context != NULL);
VarSize = sizeof (EFI_PHYSICAL_ADDRESS);
Status = RestoreLockBox ( Status = RestoreLockBox (
&gEfiBootScriptExecutorVariableGuid, &gEfiBootScriptExecutorVariableGuid,
&TempEfiBootScriptExecutorVariable, &TempEfiBootScriptExecutorVariable,
@ -910,6 +913,7 @@ S3RestoreConfig2 (
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
EfiBootScriptExecutorVariable = (BOOT_SCRIPT_EXECUTOR_VARIABLE *) (UINTN) TempEfiBootScriptExecutorVariable; EfiBootScriptExecutorVariable = (BOOT_SCRIPT_EXECUTOR_VARIABLE *) (UINTN) TempEfiBootScriptExecutorVariable;
ASSERT (EfiBootScriptExecutorVariable != NULL);
DEBUG (( EFI_D_ERROR, "AcpiS3Context = %x\n", AcpiS3Context)); DEBUG (( EFI_D_ERROR, "AcpiS3Context = %x\n", AcpiS3Context));
DEBUG (( EFI_D_ERROR, "Waking Vector = %x\n", ((EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *) ((UINTN) (AcpiS3Context->AcpiFacsTable)))->FirmwareWakingVector)); DEBUG (( EFI_D_ERROR, "Waking Vector = %x\n", ((EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *) ((UINTN) (AcpiS3Context->AcpiFacsTable)))->FirmwareWakingVector));