diff options
Diffstat (limited to 'OvmfPkg/PlatformPei/MemDetect.c')
| -rw-r--r-- | OvmfPkg/PlatformPei/MemDetect.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetect.c index b0b7e466a7..1bcb5a08bc 100644 --- a/OvmfPkg/PlatformPei/MemDetect.c +++ b/OvmfPkg/PlatformPei/MemDetect.c @@ -320,8 +320,15 @@ GetSystemMemorySizeBelow4gb ( VOID
)
{
- UINT8 Cmos0x34;
- UINT8 Cmos0x35;
+ EFI_STATUS Status;
+ UINT64 LowerMemorySize = 0;
+ UINT8 Cmos0x34;
+ UINT8 Cmos0x35;
+
+ Status = ScanOrAdd64BitE820Ram (FALSE, &LowerMemorySize, NULL);
+ if ((Status == EFI_SUCCESS) && (LowerMemorySize > 0)) {
+ return (UINT32)LowerMemorySize;
+ }
//
// CMOS 0x34/0x35 specifies the system memory above 16 MB.
@@ -776,7 +783,6 @@ QemuInitializeRam ( // Determine total memory size available
//
LowerMemorySize = GetSystemMemorySizeBelow4gb ();
- UpperMemorySize = GetSystemMemorySizeAbove4gb ();
if (mBootMode == BOOT_ON_S3_RESUME) {
//
@@ -826,8 +832,11 @@ QemuInitializeRam ( // memory size read from the CMOS.
//
Status = ScanOrAdd64BitE820Ram (TRUE, NULL, NULL);
- if (EFI_ERROR (Status) && (UpperMemorySize != 0)) {
- AddMemoryBaseSizeHob (BASE_4GB, UpperMemorySize);
+ if (EFI_ERROR (Status)) {
+ UpperMemorySize = GetSystemMemorySizeAbove4gb ();
+ if (UpperMemorySize != 0) {
+ AddMemoryBaseSizeHob (BASE_4GB, UpperMemorySize);
+ }
}
}
|