OvmfPkg/PlatformPei: extract memory type info defaults to PCDs

Some OvmfPkg modules already depend on "EmbeddedPkg.dec"; thus, replace
the open-coded memory type info defaults in the source code with the
EmbeddedPkg PCDs that stand for the same purpose. Consequently, platform
builders can override these values with the "--pcd" option of "build",
without source code updates.

While at it, sort the memory type names alphabetically.

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2706
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20200508121651.16045-4-lersek@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@arm.com>

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index e54aecdf277660cc378eac2d198636e0cea818db..c3081e3299766e219c680f25ed083441ca178721 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -536,6 +536,18 @@
   gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2\r
 !endif\r
 \r
+  #\r
+  # The NumberOfPages values below are ad-hoc. They are updated sporadically at\r
+  # best (please refer to git-blame for past updates). The values capture a set\r
+  # of BIN hints that made sense at a particular time, for some (now likely\r
+  # unknown) workloads / boot paths.\r
+  #\r
+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS|0x4\r
+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory|0x8\r
+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiReservedMemoryType|0x4\r
+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode|0x30\r
+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData|0x24\r
+\r
   #\r
   # Network Pcds\r
   #\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index c0c8397cb7284e981156e4dcbef7bc5624c4ee95..cb0c10e6f4ca1aeb7ff501128b340b161663ec64 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -540,6 +540,19 @@
   gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2\r
 !endif\r
 \r
+[PcdsFixedAtBuild.IA32]\r
+  #\r
+  # The NumberOfPages values below are ad-hoc. They are updated sporadically at\r
+  # best (please refer to git-blame for past updates). The values capture a set\r
+  # of BIN hints that made sense at a particular time, for some (now likely\r
+  # unknown) workloads / boot paths.\r
+  #\r
+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS|0x4\r
+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory|0x8\r
+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiReservedMemoryType|0x4\r
+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode|0x30\r
+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData|0x24\r
+\r
 [PcdsFixedAtBuild.X64]\r
   #\r
   # Network Pcds\r

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 22112bcb047b61f6d364b837055df61ea096ae8b..c1eaf6cdb26118c163fab403c21ebab4b3ce2244 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -540,6 +540,18 @@
   gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2\r
 !endif\r
 \r
+  #\r
+  # The NumberOfPages values below are ad-hoc. They are updated sporadically at\r
+  # best (please refer to git-blame for past updates). The values capture a set\r
+  # of BIN hints that made sense at a particular time, for some (now likely\r
+  # unknown) workloads / boot paths.\r
+  #\r
+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS|0x4\r
+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory|0x8\r
+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiReservedMemoryType|0x4\r
+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode|0x30\r
+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData|0x24\r
+\r
   #\r
   # Network Pcds\r
   #\r

diff --git a/OvmfPkg/PlatformPei/MemTypeInfo.c b/OvmfPkg/PlatformPei/MemTypeInfo.c
index d287fb9d7df015e87b9cb37712261b0cb373311b..f3ce2b6865e1c3ebf075aac66b807e55c07d2308 100644 (file)
--- a/OvmfPkg/PlatformPei/MemTypeInfo.c
+++ b/OvmfPkg/PlatformPei/MemTypeInfo.c
@@ -17,19 +17,16 @@
 \r
 #include "Platform.h"\r
 \r
-//\r
-// The NumberOfPages values below are ad-hoc. They are updated sporadically at\r
-// best (please refer to git-blame for past updates). The values capture a set\r
-// of BIN hints that made sense at a particular time, for some (now likely\r
-// unknown) workloads / boot paths.\r
-//\r
+#define MEMORY_TYPE_INFO_DEFAULT(Type) \\r
+  { Type, FixedPcdGet32 (PcdMemoryType ## Type) }\r
+\r
 STATIC EFI_MEMORY_TYPE_INFORMATION mMemoryTypeInformation[] = {\r
-  { EfiACPIMemoryNVS,       0x004 },\r
-  { EfiACPIReclaimMemory,   0x008 },\r
-  { EfiReservedMemoryType,  0x004 },\r
-  { EfiRuntimeServicesData, 0x024 },\r
-  { EfiRuntimeServicesCode, 0x030 },\r
-  { EfiMaxMemoryType,       0x000 }\r
+  MEMORY_TYPE_INFO_DEFAULT (EfiACPIMemoryNVS),\r
+  MEMORY_TYPE_INFO_DEFAULT (EfiACPIReclaimMemory),\r
+  MEMORY_TYPE_INFO_DEFAULT (EfiReservedMemoryType),\r
+  MEMORY_TYPE_INFO_DEFAULT (EfiRuntimeServicesCode),\r
+  MEMORY_TYPE_INFO_DEFAULT (EfiRuntimeServicesData),\r
+  { EfiMaxMemoryType, 0 }\r
 };\r
 \r
 STATIC\r

diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf
index e72ef7963d97247aa165381ca461c47c75aa05f0..ff397b3ee9d75fd0676f708ce50184bd6d97b2d5 100644 (file)
--- a/OvmfPkg/PlatformPei/PlatformPei.inf
+++ b/OvmfPkg/PlatformPei/PlatformPei.inf
@@ -37,6 +37,7 @@
   Xen.h\r
 \r
 [Packages]\r
+  EmbeddedPkg/EmbeddedPkg.dec\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
   SecurityPkg/SecurityPkg.dec\r
@@ -105,6 +106,11 @@
 \r
 [FixedPcd]\r
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress\r
+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS\r
+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory\r
+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiReservedMemoryType\r
+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode\r
+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData\r
 \r
 [FeaturePcd]\r
   gUefiOvmfPkgTokenSpaceGuid.PcdCsmEnable\r