MdeModulePkg/DxeCore: switch to MdePkg allocation granularity macros

Remove the local definitions for the default and runtime page allocation
granularity macros, and switch to the new MdePkg versions.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

6 files changed, 22 insertions, 47 deletions

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h b/MdeModulePkg/Core/Dxe/DxeMain.h
index 5668c1f2d6..1a0babba71 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.h
+++ b/MdeModulePkg/Core/Dxe/DxeMain.h
@@ -123,31 +123,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 ///

 #define DEPEX_STACK_SIZE_INCREMENT  0x1000

 

-#if defined (MDE_CPU_IPF)

-///

-/// For Itanium machines make the default allocations 8K aligned

-///

-#define EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT  (EFI_PAGE_SIZE * 2)

-#define DEFAULT_PAGE_ALLOCATION                     (EFI_PAGE_SIZE * 2)

-

-#elif defined (MDE_CPU_AARCH64)

-///

-/// 64-bit ARM systems allow the OS to execute with 64 KB page size,

-/// so for improved interoperability with the firmware, align the

-/// runtime regions to 64 KB as well

-///

-#define EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT  (SIZE_64KB)

-#define DEFAULT_PAGE_ALLOCATION                     (EFI_PAGE_SIZE)

-

-#else

-///

-/// For generic EFI machines make the default allocations 4K aligned

-///

-#define EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT  (EFI_PAGE_SIZE)

-#define DEFAULT_PAGE_ALLOCATION                     (EFI_PAGE_SIZE)

-

-#endif

-

 typedef struct {

   EFI_GUID                    *ProtocolGuid;

   VOID                        **Protocol;

diff --git a/MdeModulePkg/Core/Dxe/Mem/Page.c b/MdeModulePkg/Core/Dxe/Mem/Page.c
index 7e8fa94d7d..260a30a214 100644
--- a/MdeModulePkg/Core/Dxe/Mem/Page.c
+++ b/MdeModulePkg/Core/Dxe/Mem/Page.c
@@ -15,8 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "DxeMain.h"

 #include "Imem.h"

 

-#define EFI_DEFAULT_PAGE_ALLOCATION_ALIGNMENT  (EFI_PAGE_SIZE)

-

 //

 // Entry for tracking the memory regions for each memory type to coalesce similar memory types

 //

@@ -287,12 +285,14 @@ AllocateMemoryMapEntry (
     //

     // The list is empty, to allocate one page to refuel the list

     //

-    FreeDescriptorEntries = CoreAllocatePoolPages (EfiBootServicesData, EFI_SIZE_TO_PAGES(DEFAULT_PAGE_ALLOCATION), DEFAULT_PAGE_ALLOCATION);

-    if(FreeDescriptorEntries != NULL) {

+    FreeDescriptorEntries = CoreAllocatePoolPages (EfiBootServicesData,

+                              EFI_SIZE_TO_PAGES (DEFAULT_PAGE_ALLOCATION_GRANULARITY),

+                              DEFAULT_PAGE_ALLOCATION_GRANULARITY);

+    if (FreeDescriptorEntries != NULL) {

       //

       // Enque the free memmory map entries into the list

       //

-      for (Index = 0; Index< DEFAULT_PAGE_ALLOCATION / sizeof(MEMORY_MAP); Index++) {

+      for (Index = 0; Index < DEFAULT_PAGE_ALLOCATION_GRANULARITY / sizeof(MEMORY_MAP); Index++) {

         FreeDescriptorEntries[Index].Signature = MEMORY_MAP_SIGNATURE;

         InsertTailList (&mFreeMemoryMapEntryList, &FreeDescriptorEntries[Index].Link);

       }

@@ -1222,14 +1222,14 @@ CoreInternalAllocatePages (
     return EFI_INVALID_PARAMETER;

   }

 

-  Alignment = EFI_DEFAULT_PAGE_ALLOCATION_ALIGNMENT;

+  Alignment = DEFAULT_PAGE_ALLOCATION_GRANULARITY;

 

   if  (MemoryType == EfiACPIReclaimMemory   ||

        MemoryType == EfiACPIMemoryNVS       ||

        MemoryType == EfiRuntimeServicesCode ||

        MemoryType == EfiRuntimeServicesData) {

 

-    Alignment = EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT;

+    Alignment = RUNTIME_PAGE_ALLOCATION_GRANULARITY;

   }

 

   if (Type == AllocateAddress) {

@@ -1398,7 +1398,7 @@ CoreInternalFreePages (
     goto Done;

   }

 

-  Alignment = EFI_DEFAULT_PAGE_ALLOCATION_ALIGNMENT;

+  Alignment = DEFAULT_PAGE_ALLOCATION_GRANULARITY;

 

   ASSERT (Entry != NULL);

   if  (Entry->Type == EfiACPIReclaimMemory   ||

@@ -1406,7 +1406,7 @@ CoreInternalFreePages (
        Entry->Type == EfiRuntimeServicesCode ||

        Entry->Type == EfiRuntimeServicesData) {

 

-    Alignment = EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT;

+    Alignment = RUNTIME_PAGE_ALLOCATION_GRANULARITY;

 

   }

 

@@ -1925,12 +1925,12 @@ CoreTerminateMemoryMap (
         if (mMemoryTypeStatistics[Entry->Type].Runtime) {

           ASSERT (Entry->Type != EfiACPIReclaimMemory);

           ASSERT (Entry->Type != EfiACPIMemoryNVS);

-          if ((Entry->Start & (EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT - 1)) != 0) {

+          if ((Entry->Start & (RUNTIME_PAGE_ALLOCATION_GRANULARITY - 1)) != 0) {

             DEBUG((DEBUG_ERROR | DEBUG_PAGE, "ExitBootServices: A RUNTIME memory entry is not on a proper alignment.\n"));

             Status =  EFI_INVALID_PARAMETER;

             goto Done;

           }

-          if (((Entry->End + 1) & (EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT - 1)) != 0) {

+          if (((Entry->End + 1) & (RUNTIME_PAGE_ALLOCATION_GRANULARITY - 1)) != 0) {

             DEBUG((DEBUG_ERROR | DEBUG_PAGE, "ExitBootServices: A RUNTIME memory entry is not on a proper alignment.\n"));

             Status =  EFI_INVALID_PARAMETER;

             goto Done;

diff --git a/MdeModulePkg/Core/Dxe/Mem/Pool.c b/MdeModulePkg/Core/Dxe/Mem/Pool.c
index ced64443c7..5248ee2e6c 100644
--- a/MdeModulePkg/Core/Dxe/Mem/Pool.c
+++ b/MdeModulePkg/Core/Dxe/Mem/Pool.c
@@ -352,9 +352,9 @@ CoreAllocatePoolI (
        PoolType == EfiRuntimeServicesCode ||

        PoolType == EfiRuntimeServicesData) {

 

-    Granularity = EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT;

+    Granularity = RUNTIME_PAGE_ALLOCATION_GRANULARITY;

   } else {

-    Granularity = DEFAULT_PAGE_ALLOCATION;

+    Granularity = DEFAULT_PAGE_ALLOCATION_GRANULARITY;

   }

 

   //

@@ -643,9 +643,9 @@ CoreFreePoolI (
        Head->Type == EfiRuntimeServicesCode ||

        Head->Type == EfiRuntimeServicesData) {

 

-    Granularity = EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT;

+    Granularity = RUNTIME_PAGE_ALLOCATION_GRANULARITY;

   } else {

-    Granularity = DEFAULT_PAGE_ALLOCATION;

+    Granularity = DEFAULT_PAGE_ALLOCATION_GRANULARITY;

   }

 

   if (PoolType != NULL) {

diff --git a/MdeModulePkg/Core/Dxe/Misc/MemoryAttributesTable.c b/MdeModulePkg/Core/Dxe/Misc/MemoryAttributesTable.c
index 408bcd3527..35156aea14 100644
--- a/MdeModulePkg/Core/Dxe/Misc/MemoryAttributesTable.c
+++ b/MdeModulePkg/Core/Dxe/Misc/MemoryAttributesTable.c
@@ -104,7 +104,7 @@ InstallMemoryAttributesTable (
 

   if ((mPropertiesTable.MemoryProtectionAttribute & EFI_PROPERTIES_RUNTIME_MEMORY_PROTECTION_NON_EXECUTABLE_PE_DATA) == 0) {

     DEBUG ((EFI_D_VERBOSE, "MemoryProtectionAttribute NON_EXECUTABLE_PE_DATA is not set, "));

-    DEBUG ((EFI_D_VERBOSE, "because Runtime Driver Section Alignment is not %dK.\n", EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT >> 10));

+    DEBUG ((EFI_D_VERBOSE, "because Runtime Driver Section Alignment is not %dK.\n", RUNTIME_PAGE_ALLOCATION_GRANULARITY >> 10));

     return ;

   }

 

diff --git a/MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c b/MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c
index 45f360cccf..070228bc72 100644
--- a/MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c
+++ b/MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c
@@ -344,12 +344,12 @@ IsMemoryProtectionSectionAligned (
   switch (MemoryType) {

   case EfiRuntimeServicesCode:

   case EfiACPIMemoryNVS:

-    PageAlignment = EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT;

+    PageAlignment = RUNTIME_PAGE_ALLOCATION_GRANULARITY;

     break;

   case EfiRuntimeServicesData:

   case EfiACPIReclaimMemory:

     ASSERT (FALSE);

-    PageAlignment = EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT;

+    PageAlignment = RUNTIME_PAGE_ALLOCATION_GRANULARITY;

     break;

   case EfiBootServicesCode:

   case EfiLoaderCode:

diff --git a/MdeModulePkg/Core/Dxe/Misc/PropertiesTable.c b/MdeModulePkg/Core/Dxe/Misc/PropertiesTable.c
index 5ea20dbf89..e7c4a95712 100644
--- a/MdeModulePkg/Core/Dxe/Misc/PropertiesTable.c
+++ b/MdeModulePkg/Core/Dxe/Misc/PropertiesTable.c
@@ -804,7 +804,7 @@ SetPropertiesTableSectionAlignment (
   IN UINT32  SectionAlignment

   )

 {

-  if (((SectionAlignment & (EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT - 1)) != 0) &&

+  if (((SectionAlignment & (RUNTIME_PAGE_ALLOCATION_GRANULARITY - 1)) != 0) &&

       ((mPropertiesTable.MemoryProtectionAttribute & EFI_PROPERTIES_RUNTIME_MEMORY_PROTECTION_NON_EXECUTABLE_PE_DATA) != 0)) {

     DEBUG ((EFI_D_VERBOSE, "SetPropertiesTableSectionAlignment - Clear\n"));

     mPropertiesTable.MemoryProtectionAttribute &= ~((UINT64)EFI_PROPERTIES_RUNTIME_MEMORY_PROTECTION_NON_EXECUTABLE_PE_DATA);

@@ -1136,9 +1136,9 @@ InsertImageRecord (
   }

 

   SetPropertiesTableSectionAlignment (SectionAlignment);

-  if ((SectionAlignment & (EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT - 1)) != 0) {

+  if ((SectionAlignment & (RUNTIME_PAGE_ALLOCATION_GRANULARITY - 1)) != 0) {

     DEBUG ((EFI_D_WARN, "!!!!!!!!  InsertImageRecord - Section Alignment(0x%x) is not %dK  !!!!!!!!\n",

-      SectionAlignment, EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT >> 10));

+      SectionAlignment, RUNTIME_PAGE_ALLOCATION_GRANULARITY >> 10));

     PdbPointer = PeCoffLoaderGetPdbPointer ((VOID*) (UINTN) ImageAddress);

     if (PdbPointer != NULL) {

       DEBUG ((EFI_D_WARN, "!!!!!!!!  Image - %a  !!!!!!!!\n", PdbPointer));

@@ -1338,7 +1338,7 @@ InstallPropertiesTable (
     DEBUG ((EFI_D_INFO, "MemoryProtectionAttribute - 0x%016lx\n", mPropertiesTable.MemoryProtectionAttribute));

     if ((mPropertiesTable.MemoryProtectionAttribute & EFI_PROPERTIES_RUNTIME_MEMORY_PROTECTION_NON_EXECUTABLE_PE_DATA) == 0) {

       DEBUG ((EFI_D_ERROR, "MemoryProtectionAttribute NON_EXECUTABLE_PE_DATA is not set, "));

-      DEBUG ((EFI_D_ERROR, "because Runtime Driver Section Alignment is not %dK.\n", EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT >> 10));

+      DEBUG ((EFI_D_ERROR, "because Runtime Driver Section Alignment is not %dK.\n", RUNTIME_PAGE_ALLOCATION_GRANULARITY >> 10));

       return ;

     }