diff --git a/StandaloneMmPkg/Drivers/StandaloneMmIplPei/MmFoundationHob.c b/StandaloneMmPkg/Drivers/StandaloneMmIplPei/MmFoundationHob.c index 96e041639f..fc6d3476a4 100644 --- a/StandaloneMmPkg/Drivers/StandaloneMmIplPei/MmFoundationHob.c +++ b/StandaloneMmPkg/Drivers/StandaloneMmIplPei/MmFoundationHob.c @@ -1026,9 +1026,12 @@ CreateMmFoundationHobList ( // // Build ACPI variable HOB // - HobLength = GetRemainingHobSize (*FoundationHobSize, UsedSize); - MmIplCopyGuidHob (FoundationHobList + UsedSize, &HobLength, &gEfiAcpiVariableGuid, FALSE); - UsedSize += HobLength; + if (PcdGetBool (PcdAcpiS3Enable)) { + // Only check on this variable when S3 needs it. + HobLength = GetRemainingHobSize (*FoundationHobSize, UsedSize); + MmIplCopyGuidHob (FoundationHobList + UsedSize, &HobLength, &gEfiAcpiVariableGuid, FALSE); + UsedSize += HobLength; + } if (FeaturePcdGet (PcdCpuSmmProfileEnable)) { //