X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=OvmfPkg%2FPlatformPei%2FMemDetect.c;h=37030e6898390fcbd2e88ffe5d71363f546ba1b3;hb=74e5c15842b75be9e7d2057ac0345cbf524b2234;hp=5e09cc93750e8c9b79a9829a4f6519d1f62a326d;hpb=56d7640a53bf23a4afa211c49b82527879edf65f;p=mirror_edk2.git

diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetect.c
index 5e09cc9375..37030e6898 100644
--- a/OvmfPkg/PlatformPei/MemDetect.c
+++ b/OvmfPkg/PlatformPei/MemDetect.c
@@ -1,7 +1,7 @@
 /**@file
   Memory Detection for Virtual Machines.
 
-  Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -30,13 +30,14 @@ Module Name:
 #include <Library/PcdLib.h>
 #include <Library/PeimEntryPoint.h>
 #include <Library/ResourcePublicationLib.h>
+#include <Library/MtrrLib.h>
 
 #include "Platform.h"
 #include "Cmos.h"
 
-STATIC
-UINTN
-GetSystemMemorySize (
+UINT32
+GetSystemMemorySizeBelow4gb (
+  VOID
   )
 {
   UINT8 Cmos0x34;
@@ -54,40 +55,65 @@ GetSystemMemorySize (
   Cmos0x34 = (UINT8) CmosRead8 (0x34);
   Cmos0x35 = (UINT8) CmosRead8 (0x35);
 
-  return ((((Cmos0x35 << 8) + Cmos0x34) << 16) + SIZE_16MB);
+  return (((UINTN)((Cmos0x35 << 8) + Cmos0x34) << 16) + SIZE_16MB);
 }
 
 
+STATIC
+UINT64
+GetSystemMemorySizeAbove4gb (
+  )
+{
+  UINT32 Size;
+  UINTN  CmosIndex;
+
+  //
+  // CMOS 0x5b-0x5d specifies the system memory above 4GB MB.
+  // * CMOS(0x5d) is the most significant size byte
+  // * CMOS(0x5c) is the middle size byte
+  // * CMOS(0x5b) is the least significant size byte
+  // * The size is specified in 64kb chunks
+  //
+
+  Size = 0;
+  for (CmosIndex = 0x5d; CmosIndex >= 0x5b; CmosIndex--) {
+    Size = (UINT32) (Size << 8) + (UINT32) CmosRead8 (CmosIndex);
+  }
+
+  return LShiftU64 (Size, 16);
+}
+
 /**
-  Peform Memory Detection
+  Publish PEI core memory
 
   @return EFI_SUCCESS     The PEIM initialized successfully.
 
 **/
 EFI_STATUS
-MemDetect (
+PublishPeiMemory (
+  VOID
   )
 {
   EFI_STATUS                  Status;
   EFI_PHYSICAL_ADDRESS        MemoryBase;
   UINT64                      MemorySize;
-  UINT64                      TotalMemorySize;
-
-  DEBUG ((EFI_D_ERROR, "MemDetect called\n"));
-
-  //
-  // Determine total memory size available
-  //
-  TotalMemorySize = (UINT64)GetSystemMemorySize ();
-
-  //
-  // Determine the range of memory to use during PEI
-  //
-  MemoryBase = PcdGet32 (PcdOvmfMemFvBase) + PcdGet32 (PcdOvmfMemFvSize);
-  MemorySize = TotalMemorySize - MemoryBase;
-  if (MemorySize > SIZE_16MB) {
-    MemoryBase = TotalMemorySize - SIZE_16MB;
-    MemorySize = SIZE_16MB;
+  UINT64                      LowerMemorySize;
+
+  if (mBootMode == BOOT_ON_S3_RESUME) {
+    MemoryBase = PcdGet32 (PcdS3AcpiReservedMemoryBase);
+    MemorySize = PcdGet32 (PcdS3AcpiReservedMemorySize);
+  } else {
+    LowerMemorySize = GetSystemMemorySizeBelow4gb ();
+
+    //
+    // Determine the range of memory to use during PEI
+    //
+    MemoryBase = PcdGet32 (PcdOvmfDxeMemFvBase) + PcdGet32 (PcdOvmfDxeMemFvSize);
+    MemorySize = LowerMemorySize - MemoryBase;
+    if (MemorySize > SIZE_64MB) {
+      MemoryBase = LowerMemorySize - SIZE_64MB;
+      MemorySize = SIZE_64MB;
+    }
   }
 
   //
@@ -96,13 +122,100 @@ MemDetect (
   Status = PublishSystemMemory(MemoryBase, MemorySize);
   ASSERT_EFI_ERROR (Status);
 
+  return Status;
+}
+
+
+/**
+  Peform Memory Detection for QEMU / KVM
+
+**/
+STATIC
+VOID
+QemuInitializeRam (
+  VOID
+  )
+{
+  UINT64                      LowerMemorySize;
+  UINT64                      UpperMemorySize;
+
+  DEBUG ((EFI_D_INFO, "%a called\n", __FUNCTION__));
+
   //
-  // Create memory HOBs
+  // Determine total memory size available
   //
-  AddMemoryBaseSizeHob (MemoryBase, MemorySize);
-  AddMemoryRangeHob (BASE_1MB, MemoryBase);
-  AddMemoryRangeHob (0, BASE_512KB + BASE_128KB);
+  LowerMemorySize = GetSystemMemorySizeBelow4gb ();
+  UpperMemorySize = GetSystemMemorySizeAbove4gb ();
+
+  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);
 
-  return EFI_SUCCESS;
+  if (UpperMemorySize != 0) {
+    if (mBootMode != BOOT_ON_S3_RESUME) {
+      AddUntestedMemoryBaseSizeHob (BASE_4GB, UpperMemorySize);
+    }
+
+    MtrrSetMemoryAttribute (BASE_4GB, UpperMemorySize, CacheWriteBack);
+  }
 }
 
+/**
+  Publish system RAM and reserve memory regions
+
+**/
+VOID
+InitializeRamRegions (
+  VOID
+  )
+{
+  if (!mXen) {
+    QemuInitializeRam ();
+  } else {
+    XenPublishRamRegions ();
+  }
+
+  if (mS3Supported && mBootMode != BOOT_ON_S3_RESUME) {
+    //
+    // This is the memory range that will be used for PEI on S3 resume
+    //
+    BuildMemoryAllocationHob (
+      (EFI_PHYSICAL_ADDRESS)(UINTN) PcdGet32 (PcdS3AcpiReservedMemoryBase),
+      (UINT64)(UINTN) PcdGet32 (PcdS3AcpiReservedMemorySize),
+      EfiACPIMemoryNVS
+      );
+
+    //
+    // Cover the initial RAM area used as stack and temporary PEI heap.
+    //
+    // This is reserved as ACPI NVS so it can be used on S3 resume.
+    //
+    BuildMemoryAllocationHob (
+      PcdGet32 (PcdOvmfSecPeiTempRamBase),
+      PcdGet32 (PcdOvmfSecPeiTempRamSize),
+      EfiACPIMemoryNVS
+      );
+
+#ifdef MDE_CPU_X64
+    //
+    // Reserve the initial page tables built by the reset vector code.
+    //
+    // Since this memory range will be used by the Reset Vector on S3
+    // resume, it must be reserved as ACPI NVS.
+    //
+    BuildMemoryAllocationHob (
+      (EFI_PHYSICAL_ADDRESS)(UINTN) PcdGet32 (PcdOvmfSecPageTablesBase),
+      (UINT64)(UINTN) PcdGet32 (PcdOvmfSecPageTablesSize),
+      EfiACPIMemoryNVS
+      );
+#endif
+  }
+}