MdeModulePkg/DxeCore: switch to MdePkg allocation granularity macros

[mirror_edk2.git] / MdeModulePkg / Core / Dxe / Mem / Pool.c

diff --git a/MdeModulePkg/Core/Dxe/Mem/Pool.c b/MdeModulePkg/Core/Dxe/Mem/Pool.c
index ebb2fceedd8050c7202a20791b8ee278ece4ab91..5248ee2e6c0221cc2fbd713078b2a4a621c03da0 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Mem/Pool.c
+++ b/MdeModulePkg/Core/Dxe/Mem/Pool.c
@@ -310,6 +310,10 @@ CoreAllocatePoolPagesI (
   Buffer = CoreAllocatePoolPages (PoolType, NoPages, Granularity);\r
   CoreReleaseMemoryLock ();\r
 \r
   Buffer = CoreAllocatePoolPages (PoolType, NoPages, Granularity);\r
   CoreReleaseMemoryLock ();\r
 \r

+  if (Buffer != NULL) {\r
+    ApplyMemoryProtectionPolicy (EfiConventionalMemory, PoolType,\r
+      (EFI_PHYSICAL_ADDRESS)(UINTN)Buffer, EFI_PAGES_TO_SIZE (NoPages));\r
+  }\r

   return Buffer;\r
 }\r
 \r
   return Buffer;\r
 }\r
 \r


@@ -348,9 +352,9 @@ CoreAllocatePoolI (
        PoolType == EfiRuntimeServicesCode ||\r
        PoolType == EfiRuntimeServicesData) {\r
 \r
        PoolType == EfiRuntimeServicesCode ||\r
        PoolType == EfiRuntimeServicesData) {\r
 \r

-    Granularity = EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT;\r
+    Granularity = RUNTIME_PAGE_ALLOCATION_GRANULARITY;\r

   } else {\r
   } else {\r

-    Granularity = DEFAULT_PAGE_ALLOCATION;\r
+    Granularity = DEFAULT_PAGE_ALLOCATION_GRANULARITY;\r

   }\r
 \r
   //\r
   }\r
 \r
   //\r


@@ -560,6 +564,9 @@ CoreFreePoolPagesI (
   CoreAcquireMemoryLock ();\r
   CoreFreePoolPages (Memory, NoPages);\r
   CoreReleaseMemoryLock ();\r
   CoreAcquireMemoryLock ();\r
   CoreFreePoolPages (Memory, NoPages);\r
   CoreReleaseMemoryLock ();\r

+\r
+  ApplyMemoryProtectionPolicy (PoolType, EfiConventionalMemory,\r
+    (EFI_PHYSICAL_ADDRESS)(UINTN)Memory, EFI_PAGES_TO_SIZE (NoPages));\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -636,9 +643,9 @@ CoreFreePoolI (
        Head->Type == EfiRuntimeServicesCode ||\r
        Head->Type == EfiRuntimeServicesData) {\r
 \r
        Head->Type == EfiRuntimeServicesCode ||\r
        Head->Type == EfiRuntimeServicesData) {\r
 \r

-    Granularity = EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT;\r
+    Granularity = RUNTIME_PAGE_ALLOCATION_GRANULARITY;\r

   } else {\r
   } else {\r

-    Granularity = DEFAULT_PAGE_ALLOCATION;\r
+    Granularity = DEFAULT_PAGE_ALLOCATION_GRANULARITY;\r

   }\r
 \r
   if (PoolType != NULL) {\r
   }\r
 \r
   if (PoolType != NULL) {\r