OvmfPkg: Use BZ3937_EFI_RESOURCE_MEMORY_UNACCEPTED defined in MdeModulePkg

RFC: https://bugzilla.tianocore.org/show_bug.cgi?id=3937

BZ3937_EFI_RESOURCE_MEMORY_UNACCEPTED is defined in MdeModulePkg. The
files which use the definition are updated as well.

Cc: Erdem Aktas <erdemaktas@google.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: James Bottomley <jejb@linux.ibm.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Min Xu <min.m.xu@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>

diff --git a/OvmfPkg/Library/PeilessStartupLib/Hob.c b/OvmfPkg/Library/PeilessStartupLib/Hob.c
index 5fc84a80902584f7798a05cb6b330dc9ad24066d..630ce445ebec024e022a091f8daae9ed636cf562 100644 (file)
--- a/OvmfPkg/Library/PeilessStartupLib/Hob.c
+++ b/OvmfPkg/Library/PeilessStartupLib/Hob.c
@@ -20,10 +20,9 @@
 #include <IndustryStandard/UefiTcgPlatform.h>\r
 #include <Library/PlatformInitLib.h>\r
 #include <OvmfPlatforms.h>\r
+#include <Pi/PrePiHob.h>\r
 #include "PeilessStartupInternal.h"\r
 \r
-#define EFI_RESOURCE_MEMORY_UNACCEPTED  7\r
-\r
 /**\r
  * Construct the HobList in SEC phase.\r
  *\r
@@ -92,7 +91,7 @@ ConstructFwHobList (
   //\r
   while (!END_OF_HOB_LIST (Hob)) {\r
     if (Hob.Header->HobType == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) {\r
-      if (Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_MEMORY_UNACCEPTED) {\r
+      if (Hob.ResourceDescriptor->ResourceType == BZ3937_EFI_RESOURCE_MEMORY_UNACCEPTED) {\r
         PhysicalEnd    = Hob.ResourceDescriptor->PhysicalStart + Hob.ResourceDescriptor->ResourceLength;\r
         ResourceLength = Hob.ResourceDescriptor->ResourceLength;\r
 \r

diff --git a/OvmfPkg/Library/PlatformInitLib/IntelTdx.c b/OvmfPkg/Library/PlatformInitLib/IntelTdx.c
index c6d7c8bb6e0e73a4d97910ecd487259558acbf19..797f880df0350e5758987d417f6630abed1a1621 100644 (file)
--- a/OvmfPkg/Library/PlatformInitLib/IntelTdx.c
+++ b/OvmfPkg/Library/PlatformInitLib/IntelTdx.c
@@ -20,11 +20,11 @@
 #include <Library/PeiServicesLib.h>\r
 #include <Library/TdxLib.h>\r
 #include <Library/SynchronizationLib.h>\r
+#include <Pi/PrePiHob.h>\r
 #include <WorkArea.h>\r
 #include <ConfidentialComputingGuestAttr.h>\r
 \r
-#define ALIGNED_2MB_MASK                0x1fffff\r
-#define EFI_RESOURCE_MEMORY_UNACCEPTED  7\r
+#define ALIGNED_2MB_MASK  0x1fffff\r
 \r
 /**\r
   This function will be called to accept pages. Only BSP accepts pages.\r
@@ -211,7 +211,7 @@ ValidateHobList (
     EFI_RESOURCE_MEMORY_MAPPED_IO_PORT,\r
     EFI_RESOURCE_MEMORY_RESERVED,\r
     EFI_RESOURCE_IO_RESERVED,\r
-    EFI_RESOURCE_MEMORY_UNACCEPTED\r
+    BZ3937_EFI_RESOURCE_MEMORY_UNACCEPTED\r
   };\r
 \r
   if (VmmHobList == NULL) {\r
@@ -387,7 +387,7 @@ ProcessHobList (
     if (Hob.Header->HobType == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) {\r
       DEBUG ((DEBUG_INFO, "\nResourceType: 0x%x\n", Hob.ResourceDescriptor->ResourceType));\r
 \r
-      if (Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_MEMORY_UNACCEPTED) {\r
+      if (Hob.ResourceDescriptor->ResourceType == BZ3937_EFI_RESOURCE_MEMORY_UNACCEPTED) {\r
         DEBUG ((DEBUG_INFO, "ResourceAttribute: 0x%x\n", Hob.ResourceDescriptor->ResourceAttribute));\r
         DEBUG ((DEBUG_INFO, "PhysicalStart: 0x%llx\n", Hob.ResourceDescriptor->PhysicalStart));\r
         DEBUG ((DEBUG_INFO, "ResourceLength: 0x%llx\n", Hob.ResourceDescriptor->ResourceLength));\r
@@ -488,7 +488,7 @@ TransferTdxHobList (
         ResourceType      = Hob.ResourceDescriptor->ResourceType;\r
         ResourceAttribute = Hob.ResourceDescriptor->ResourceAttribute;\r
 \r
-        if (ResourceType == EFI_RESOURCE_MEMORY_UNACCEPTED) {\r
+        if (ResourceType == BZ3937_EFI_RESOURCE_MEMORY_UNACCEPTED) {\r
           ResourceType       = EFI_RESOURCE_SYSTEM_MEMORY;\r
           ResourceAttribute |= (EFI_RESOURCE_ATTRIBUTE_PRESENT | EFI_RESOURCE_ATTRIBUTE_INITIALIZED | EFI_RESOURCE_ATTRIBUTE_TESTED);\r
         }\r