MdeModulePkg: Add New Memory Attributes

[mirror_edk2.git] / MdeModulePkg / Core / Dxe / Gcd / Gcd.c

diff --git a/MdeModulePkg/Core/Dxe/Gcd/Gcd.c b/MdeModulePkg/Core/Dxe/Gcd/Gcd.c
index 74f3b1b9f60724c60f0baab66cf93f1b9ac6973c..2d8c076f71135c00210f4840ee73d15c6921adb0 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Gcd/Gcd.c
+++ b/MdeModulePkg/Core/Dxe/Gcd/Gcd.c
@@ -35,13 +35,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #define PRESENT_MEMORY_ATTRIBUTES     (EFI_RESOURCE_ATTRIBUTE_PRESENT)\r
 \r
-#define EXCLUSIVE_MEMORY_ATTRIBUTES   (EFI_MEMORY_UC | EFI_MEMORY_WC | \\r
-                                       EFI_MEMORY_WT | EFI_MEMORY_WB | \\r
-                                       EFI_MEMORY_WP | EFI_MEMORY_UCE)\r
-\r
-#define NONEXCLUSIVE_MEMORY_ATTRIBUTES (EFI_MEMORY_XP | EFI_MEMORY_RP | \\r
-                                        EFI_MEMORY_RO)\r
-\r
 //\r
 // Module Variables\r
 //\r
@@ -665,7 +658,7 @@ ConverToCpuArchAttributes (
 {\r
   UINT64      CpuArchAttributes;\r
 \r
-  CpuArchAttributes = Attributes & NONEXCLUSIVE_MEMORY_ATTRIBUTES;\r
+  CpuArchAttributes = Attributes & EFI_MEMORY_ATTRIBUTE_MASK;\r
 \r
   if ( (Attributes & EFI_MEMORY_UC) == EFI_MEMORY_UC) {\r
     CpuArchAttributes |= EFI_MEMORY_UC;\r
@@ -951,7 +944,7 @@ CoreConvertSpace (
         // Keep original CPU arch attributes when caller just calls\r
         // SetMemorySpaceAttributes() with none CPU arch attributes (for example, RUNTIME).\r
         //\r
-        Attributes |= (Entry->Attributes & (EXCLUSIVE_MEMORY_ATTRIBUTES | NONEXCLUSIVE_MEMORY_ATTRIBUTES));\r
+        Attributes |= (Entry->Attributes & (EFI_CACHE_ATTRIBUTE_MASK | EFI_MEMORY_ATTRIBUTE_MASK));\r
       }\r
       Entry->Attributes = Attributes;\r
       break;\r