This driver is dispatched by Dxe core and the driver will reload itself to ACPI reserved memory\r
in the entry point. The functionality is to interpret and restore the S3 boot script\r
\r
-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>\r
\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
};\r
\r
BOOLEAN mPage1GSupport = FALSE;\r
+UINT64 mAddressEncMask = 0;\r
\r
/**\r
Entry function of Boot script exector. This function will be executed in\r
// for that parameter.\r
//\r
Status = S3BootScriptExecute ();\r
- \r
+\r
//\r
// If invalid script table or opcode in S3 boot script table.\r
//\r
ASSERT_EFI_ERROR (Status);\r
- \r
+\r
if (EFI_ERROR (Status)) {\r
CpuDeadLoop ();\r
return Status;\r
//\r
if (PeiS3ResumeState != 0) {\r
//\r
- // Need report status back to S3ResumePeim. \r
+ // Need report status back to S3ResumePeim.\r
// If boot script execution is failed, S3ResumePeim wil report the error status code.\r
//\r
PeiS3ResumeState->ReturnStatus = (UINT64)(UINTN)Status;\r
//\r
// X64 S3 Resume\r
//\r
- DEBUG ((EFI_D_ERROR, "Call AsmDisablePaging64() to return to S3 Resume in PEI Phase\n"));\r
+ DEBUG ((DEBUG_INFO, "Call AsmDisablePaging64() to return to S3 Resume in PEI Phase\n"));\r
PeiS3ResumeState->AsmTransferControl = (EFI_PHYSICAL_ADDRESS)(UINTN)AsmTransferControl32;\r
\r
if ((Facs != NULL) &&\r
//\r
// IA32 S3 Resume\r
//\r
- DEBUG ((EFI_D_ERROR, "Call SwitchStack() to return to S3 Resume in PEI Phase\n"));\r
+ DEBUG ((DEBUG_INFO, "Call SwitchStack() to return to S3 Resume in PEI Phase\n"));\r
PeiS3ResumeState->AsmTransferControl = (EFI_PHYSICAL_ADDRESS)(UINTN)AsmTransferControl;\r
\r
SwitchStack (\r
CpuDeadLoop();\r
return EFI_UNSUPPORTED;\r
}\r
- \r
+\r
//\r
// S3ResumePeim does not provide a way to jump back to itself, so resume to OS here directly\r
//\r
//\r
// X64 long mode waking vector\r
//\r
- DEBUG (( EFI_D_ERROR, "Transfer to 64bit OS waking vector - %x\r\n", (UINTN)Facs->XFirmwareWakingVector));\r
+ DEBUG ((DEBUG_INFO, "Transfer to 64bit OS waking vector - %x\r\n", (UINTN)Facs->XFirmwareWakingVector));\r
if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) {\r
SwitchStack (\r
(SWITCH_STACK_ENTRY_POINT)(UINTN)Facs->XFirmwareWakingVector,\r
//\r
// IA32 protected mode waking vector (Page disabled)\r
//\r
- DEBUG (( EFI_D_ERROR, "Transfer to 32bit OS waking vector - %x\r\n", (UINTN)Facs->XFirmwareWakingVector));\r
+ DEBUG ((DEBUG_INFO, "Transfer to 32bit OS waking vector - %x\r\n", (UINTN)Facs->XFirmwareWakingVector));\r
if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) {\r
AsmDisablePaging64 (\r
0x10,\r
//\r
// 16bit Realmode waking vector\r
//\r
- DEBUG (( EFI_D_ERROR, "Transfer to 16bit OS waking vector - %x\r\n", (UINTN)Facs->FirmwareWakingVector));\r
+ DEBUG ((DEBUG_INFO, "Transfer to 16bit OS waking vector - %x\r\n", (UINTN)Facs->FirmwareWakingVector));\r
AsmTransferControl (Facs->FirmwareWakingVector, 0x0);\r
}\r
\r
/**\r
This is the Event notification function to reload BootScriptExecutor image\r
to RESERVED mem and save it to LockBox.\r
- \r
+\r
@param Event Pointer to this event\r
- @param Context Event handler private data \r
+ @param Context Event handler private data\r
**/\r
VOID\r
EFIAPI\r
UINTN Pages;\r
EFI_PHYSICAL_ADDRESS FfsBuffer;\r
PE_COFF_LOADER_IMAGE_CONTEXT ImageContext;\r
+ EFI_GCD_MEMORY_SPACE_DESCRIPTOR MemDesc;\r
\r
Status = gBS->LocateProtocol (&gEfiDxeSmmReadyToLockProtocolGuid, NULL, &Interface);\r
if (EFI_ERROR (Status)) {\r
Status = PeCoffLoaderGetImageInfo (&ImageContext);\r
ASSERT_EFI_ERROR (Status);\r
if (ImageContext.SectionAlignment > EFI_PAGE_SIZE) {\r
- Pages = EFI_SIZE_TO_PAGES (ImageContext.ImageSize + ImageContext.SectionAlignment);\r
+ Pages = EFI_SIZE_TO_PAGES ((UINTN) (ImageContext.ImageSize + ImageContext.SectionAlignment));\r
} else {\r
- Pages = EFI_SIZE_TO_PAGES (ImageContext.ImageSize);\r
+ Pages = EFI_SIZE_TO_PAGES ((UINTN) ImageContext.ImageSize);\r
}\r
FfsBuffer = 0xFFFFFFFF;\r
Status = gBS->AllocatePages (\r
&FfsBuffer\r
);\r
ASSERT_EFI_ERROR (Status);\r
+\r
+ //\r
+ // Make sure that the buffer can be used to store code.\r
+ //\r
+ Status = gDS->GetMemorySpaceDescriptor (FfsBuffer, &MemDesc);\r
+ if (!EFI_ERROR (Status) && (MemDesc.Attributes & EFI_MEMORY_XP) != 0) {\r
+ gDS->SetMemorySpaceAttributes (\r
+ FfsBuffer,\r
+ EFI_PAGES_TO_SIZE (Pages),\r
+ MemDesc.Attributes & (~EFI_MEMORY_XP)\r
+ );\r
+ }\r
+\r
ImageContext.ImageAddress = (PHYSICAL_ADDRESS)(UINTN)FfsBuffer;\r
//\r
- // Align buffer on section boundry\r
+ // Align buffer on section boundary\r
//\r
ImageContext.ImageAddress += ImageContext.SectionAlignment - 1;\r
- ImageContext.ImageAddress &= ~((EFI_PHYSICAL_ADDRESS)(ImageContext.SectionAlignment - 1));\r
+ ImageContext.ImageAddress &= ~((EFI_PHYSICAL_ADDRESS)ImageContext.SectionAlignment - 1);\r
//\r
// Load the image to our new buffer\r
//\r
UINT32 RegEax;\r
UINT32 RegEdx;\r
\r
+ if (!PcdGetBool (PcdAcpiS3Enable)) {\r
+ return EFI_UNSUPPORTED;\r
+ }\r
+\r
+ //\r
+ // Make sure AddressEncMask is contained to smallest supported address field.\r
+ //\r
+ mAddressEncMask = PcdGet64 (PcdPteMemoryEncryptionAddressOrMask) & PAGING_1G_ADDRESS_MASK_64;\r
+\r
//\r
// Test if the gEfiCallerIdGuid of this image is already installed. if not, the entry\r
// point is loaded by DXE code which is the first time loaded. or else, it is already\r
projects / mirror_edk2.git / blobdiff