From 74e5c15842b75be9e7d2057ac0345cbf524b2234 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Tue, 4 Mar 2014 08:02:59 +0000 Subject: [PATCH] OvmfPkg/PlatformPei: Allocate PEI FV as ACPI NVS if S3 is supported On S3 resume, we skip decompression of the PEI FV, and expect to jump directly into it. For this to work, we need the OS to leave the memory range untouched. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jordan Justen Reviewed-by: Laszlo Ersek git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15299 6f19259b-4bc3-4df7-8a09-765794883524 --- OvmfPkg/PlatformPei/Fv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/PlatformPei/Fv.c b/OvmfPkg/PlatformPei/Fv.c index 1ee417a091..3ed775c850 100644 --- a/OvmfPkg/PlatformPei/Fv.c +++ b/OvmfPkg/PlatformPei/Fv.c @@ -13,6 +13,7 @@ **/ #include "PiPei.h" +#include "Platform.h" #include #include #include @@ -36,12 +37,12 @@ PeiFvInitialization ( // // Create a memory allocation HOB for the PEI FV. // - // Note: This should be changed to ACPI NVS when S3 resume is enabled. + // Allocate as ACPI NVS is S3 is supported // BuildMemoryAllocationHob ( PcdGet32 (PcdOvmfPeiMemFvBase), PcdGet32 (PcdOvmfPeiMemFvSize), - EfiBootServicesData + mS3Supported ? EfiACPIMemoryNVS : EfiBootServicesData ); // -- 2.39.2