diff options
| -rw-r--r-- | OvmfPkg/PlatformPei/MemDetect.c | 16 | ||||
| -rw-r--r-- | OvmfPkg/PlatformPei/Platform.c | 8 |
2 files changed, 15 insertions, 9 deletions
diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetect.c index 11c79687c4..c198c3846f 100644 --- a/OvmfPkg/PlatformPei/MemDetect.c +++ b/OvmfPkg/PlatformPei/MemDetect.c @@ -147,18 +147,22 @@ QemuInitializeRam ( LowerMemorySize = GetSystemMemorySizeBelow4gb ();
UpperMemorySize = GetSystemMemorySizeAbove4gb ();
- //
- // Create memory HOBs
- //
- AddMemoryRangeHob (BASE_1MB, LowerMemorySize);
- AddMemoryRangeHob (0, BASE_512KB + BASE_128KB);
+ if (mBootMode != BOOT_ON_S3_RESUME) {
+ //
+ // Create memory HOBs
+ //
+ AddMemoryRangeHob (BASE_1MB, LowerMemorySize);
+ AddMemoryRangeHob (0, BASE_512KB + BASE_128KB);
+ }
MtrrSetMemoryAttribute (BASE_1MB, LowerMemorySize - BASE_1MB, CacheWriteBack);
MtrrSetMemoryAttribute (0, BASE_512KB + BASE_128KB, CacheWriteBack);
if (UpperMemorySize != 0) {
- AddUntestedMemoryBaseSizeHob (BASE_4GB, UpperMemorySize);
+ if (mBootMode != BOOT_ON_S3_RESUME) {
+ AddUntestedMemoryBaseSizeHob (BASE_4GB, UpperMemorySize);
+ }
MtrrSetMemoryAttribute (BASE_4GB, UpperMemorySize, CacheWriteBack);
}
diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c index 00c688d68a..11b4cb7a14 100644 --- a/OvmfPkg/PlatformPei/Platform.c +++ b/OvmfPkg/PlatformPei/Platform.c @@ -375,11 +375,13 @@ InitializePlatform ( InitializeXen ();
}
- ReserveEmuVariableNvStore ();
+ if (mBootMode != BOOT_ON_S3_RESUME) {
+ ReserveEmuVariableNvStore ();
- PeiFvInitialization ();
+ PeiFvInitialization ();
- MemMapInitialization ();
+ MemMapInitialization ();
+ }
MiscInitialization ();
|