Merge branch 'master' into OVMF_Memory_Debug_Logging4

Signed-off-by: Aaron Young <[email protected]>

Author: ajyoung-oracle

ArmVirtPkg/ArmVirt.dsc.inc

@@ -132,7 +132,7 @@
   DebugAgentTimerLib|EmbeddedPkg/Library/DebugAgentTimerLibNull/DebugAgentTimerLibNull.inf
 
   # Flattened Device Tree (FDT) access library
-  FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf
+  FdtLib|MdePkg/Library/BaseFdtLib/BaseFdtLib.inf
 
   # PCI Libraries
   PciLib|MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf

ArmVirtPkg/ArmVirtCloudHv.dsc

@@ -61,6 +61,7 @@
 !include MdePkg/MdeLibs.dsc.inc
 
 [LibraryClasses.common.PEIM]
+  PrePiLib|EmbeddedPkg/Library/PrePiLib/PrePiLib.inf
   ArmVirtMemInfoLib|ArmVirtPkg/Library/CloudHvVirtMemInfoLib/CloudHvVirtMemInfoPeiLib.inf
 
 [LibraryClasses.common.DXE_DRIVER]

ArmVirtPkg/Library/CloudHvVirtMemInfoLib/CloudHvVirtMemInfoLib.c

@@ -9,10 +9,10 @@
 #include <PiPei.h>
 
 #include <Base.h>
-#include <libfdt.h>
 #include <Library/ArmLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/DebugLib.h>
+#include <Library/FdtLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/PcdLib.h>
 
@@ -68,32 +68,32 @@ CloudHvVirtMemInfoPeiLibConstructor (
   //
   // Make sure we have a valid device tree blob
   //
-  if (fdt_check_header (DeviceTreeBase) != 0) {
+  if (FdtCheckHeader (DeviceTreeBase) != 0) {
     return EFI_NOT_FOUND;
   }
 
   //
   // Look for the lowest memory node
   //
   for (Prev = 0; ; Prev = Node) {
-    Node = fdt_next_node (DeviceTreeBase, Prev, NULL);
+    Node = FdtNextNode (DeviceTreeBase, Prev, NULL);
     if (Node < 0) {
       break;
     }
 
     //
     // Check for memory node
     //
-    Type = fdt_getprop (DeviceTreeBase, Node, "device_type", &Len);
+    Type = FdtGetProp (DeviceTreeBase, Node, "device_type", &Len);
     if ((Type != 0) && (AsciiStrnCmp (Type, "memory", Len) == 0)) {
       //
       // Get the 'reg' property of this node. For now, we will assume
       // two 8 byte quantities for base and size, respectively.
       //
-      RegProp = fdt_getprop (DeviceTreeBase, Node, "reg", &Len);
+      RegProp = FdtGetProp (DeviceTreeBase, Node, "reg", &Len);
       if ((RegProp != 0) && (Len == (2 * sizeof (UINT64)))) {
-        CurBase = fdt64_to_cpu (ReadUnaligned64 (RegProp));
-        CurSize = fdt64_to_cpu (ReadUnaligned64 (RegProp + 1));
+        CurBase = Fdt64ToCpu (ReadUnaligned64 (RegProp));
+        CurSize = Fdt64ToCpu (ReadUnaligned64 (RegProp + 1));
 
         DEBUG ((
           DEBUG_INFO,

ArmVirtPkg/Library/CloudHvVirtMemInfoLib/CloudHvVirtMemInfoPeiLib.inf

@@ -35,6 +35,7 @@
   FdtLib
   MemoryAllocationLib
   PcdLib
+  PrePiLib
 
 [Pcd]
   gArmTokenSpaceGuid.PcdFdBaseAddress

ArmVirtPkg/Library/KvmtoolPlatformPeiLib/KvmtoolPlatformPeiLib.c

@@ -14,10 +14,10 @@
 
 #include <Library/MemoryAllocationLib.h>
 #include <Library/DebugLib.h>
+#include <Library/FdtLib.h>
 #include <Library/HobLib.h>
 #include <Library/PcdLib.h>
 #include <Library/PeiServicesLib.h>
-#include <libfdt.h>
 
 /** Initialise Platform HOBs
 
@@ -39,20 +39,20 @@ PlatformPeim (
   UINT64  *UartHobData;
 
   Base = (VOID *)(UINTN)PcdGet64 (PcdDeviceTreeInitialBaseAddress);
-  if ((Base == NULL) || (fdt_check_header (Base) != 0)) {
+  if ((Base == NULL) || (FdtCheckHeader (Base) != 0)) {
     ASSERT (0);
     return EFI_INVALID_PARAMETER;
   }
 
-  FdtSize  = fdt_totalsize (Base) + PcdGet32 (PcdDeviceTreeAllocationPadding);
+  FdtSize  = FdtTotalSize (Base) + PcdGet32 (PcdDeviceTreeAllocationPadding);
   FdtPages = EFI_SIZE_TO_PAGES (FdtSize);
   NewBase  = AllocatePages (FdtPages);
   if (NewBase == NULL) {
     ASSERT (0);
     return EFI_OUT_OF_RESOURCES;
   }
 
-  fdt_open_into (Base, NewBase, EFI_PAGES_TO_SIZE (FdtPages));
+  FdtOpenInto (Base, NewBase, EFI_PAGES_TO_SIZE (FdtPages));
 
   FdtHobData = BuildGuidHob (&gFdtHobGuid, sizeof (*FdtHobData));
   if (FdtHobData == NULL) {

ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c

@@ -12,11 +12,11 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/DebugLib.h>
+#include <Library/FdtLib.h>
 #include <Library/HobLib.h>
 #include <Library/PcdLib.h>
 #include <Library/PeiServicesLib.h>
 #include <Library/FdtSerialPortAddressLib.h>
-#include <libfdt.h>
 
 #include <Guid/EarlyPL011BaseAddress.h>
 #include <Guid/FdtHob.h>
@@ -59,13 +59,13 @@ PlatformPeim (
 
   Base = (VOID *)(UINTN)PcdGet64 (PcdDeviceTreeInitialBaseAddress);
   ASSERT (Base != NULL);
-  ASSERT (fdt_check_header (Base) == 0);
+  ASSERT (FdtCheckHeader (Base) == 0);
 
-  FdtSize  = fdt_totalsize (Base) + PcdGet32 (PcdDeviceTreeAllocationPadding);
+  FdtSize  = FdtTotalSize (Base) + PcdGet32 (PcdDeviceTreeAllocationPadding);
   FdtPages = EFI_SIZE_TO_PAGES (FdtSize);
   NewBase  = AllocatePages (FdtPages);
   ASSERT (NewBase != NULL);
-  fdt_open_into (Base, NewBase, EFI_PAGES_TO_SIZE (FdtPages));
+  FdtOpenInto (Base, NewBase, EFI_PAGES_TO_SIZE (FdtPages));
 
   FdtHobData = BuildGuidHob (&gFdtHobGuid, sizeof *FdtHobData);
   ASSERT (FdtHobData != NULL);
@@ -132,7 +132,7 @@ PlatformPeim (
   Parent = 0;
 
   for (Prev = Depth = 0; ; Prev = Node) {
-    Node = fdt_next_node (Base, Prev, &Depth);
+    Node = FdtNextNode (Base, Prev, &Depth);
     if (Node < 0) {
       break;
     }
@@ -141,7 +141,7 @@ PlatformPeim (
       Parent = Node;
     }
 
-    Compatible = fdt_getprop (Base, Node, "compatible", &Len);
+    Compatible = FdtGetProp (Base, Node, "compatible", &Len);
 
     //
     // Iterate over the NULL-separated items in the compatible string
@@ -152,12 +152,12 @@ PlatformPeim (
       if (FeaturePcdGet (PcdTpm2SupportEnabled) &&
           (AsciiStrCmp (CompItem, "tcg,tpm-tis-mmio") == 0))
       {
-        RegProp = fdt_getprop (Base, Node, "reg", &Len);
+        RegProp = FdtGetProp (Base, Node, "reg", &Len);
         ASSERT (Len == 8 || Len == 16);
         if (Len == 8) {
-          TpmBase = fdt32_to_cpu (RegProp[0]);
+          TpmBase = Fdt32ToCpu (RegProp[0]);
         } else if (Len == 16) {
-          TpmBase = fdt64_to_cpu (ReadUnaligned64 ((UINT64 *)RegProp));
+          TpmBase = Fdt64ToCpu (ReadUnaligned64 ((UINT64 *)RegProp));
         }
 
         if (Depth > 1) {
@@ -168,7 +168,7 @@ PlatformPeim (
           // tuple, where the child base and the size use the same number of
           // cells as the 'reg' property above, and the parent base uses 2 cells
           //
-          RangesProp = fdt_getprop (Base, Parent, "ranges", &RangesLen);
+          RangesProp = FdtGetProp (Base, Parent, "ranges", &RangesLen);
           ASSERT (RangesProp != NULL);
 
           //
@@ -189,16 +189,16 @@ PlatformPeim (
             }
 
             if (Len == 8) {
-              TpmBase -= fdt32_to_cpu (RangesProp[0]);
+              TpmBase -= Fdt32ToCpu (RangesProp[0]);
             } else {
-              TpmBase -= fdt64_to_cpu (ReadUnaligned64 ((UINT64 *)RangesProp));
+              TpmBase -= Fdt64ToCpu (ReadUnaligned64 ((UINT64 *)RangesProp));
             }
 
             //
             // advance RangesProp to the parent bus address
             //
             RangesProp = (UINT32 *)((UINT8 *)RangesProp + Len / 2);
-            TpmBase   += fdt64_to_cpu (ReadUnaligned64 ((UINT64 *)RangesProp));
+            TpmBase   += Fdt64ToCpu (ReadUnaligned64 ((UINT64 *)RangesProp));
           }
         }
 

ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLibConstructor.c

@@ -10,8 +10,8 @@
 #include <Pi/PiMultiPhase.h>
 #include <Library/BaseLib.h>
 #include <Library/DebugLib.h>
+#include <Library/FdtLib.h>
 #include <Library/HobLib.h>
-#include <libfdt.h>
 
 RETURN_STATUS
 EFIAPI
@@ -37,30 +37,30 @@ QemuVirtMemInfoPeiLibConstructor (
   //
   // Make sure we have a valid device tree blob
   //
-  ASSERT (fdt_check_header (DeviceTreeBase) == 0);
+  ASSERT (FdtCheckHeader (DeviceTreeBase) == 0);
 
   //
   // Look for the lowest memory node
   //
   for (Prev = 0; ; Prev = Node) {
-    Node = fdt_next_node (DeviceTreeBase, Prev, NULL);
+    Node = FdtNextNode (DeviceTreeBase, Prev, NULL);
     if (Node < 0) {
       break;
     }
 
     //
     // Check for memory node
     //
-    Type = fdt_getprop (DeviceTreeBase, Node, "device_type", &Len);
+    Type = FdtGetProp (DeviceTreeBase, Node, "device_type", &Len);
     if (Type && (AsciiStrnCmp (Type, "memory", Len) == 0)) {
       //
       // Get the 'reg' property of this node. For now, we will assume
       // two 8 byte quantities for base and size, respectively.
       //
-      RegProp = fdt_getprop (DeviceTreeBase, Node, "reg", &Len);
+      RegProp = FdtGetProp (DeviceTreeBase, Node, "reg", &Len);
       if ((RegProp != 0) && (Len == (2 * sizeof (UINT64)))) {
-        CurBase = fdt64_to_cpu (ReadUnaligned64 (RegProp));
-        CurSize = fdt64_to_cpu (ReadUnaligned64 (RegProp + 1));
+        CurBase = Fdt64ToCpu (ReadUnaligned64 (RegProp));
+        CurSize = Fdt64ToCpu (ReadUnaligned64 (RegProp + 1));
 
         DEBUG ((
           DEBUG_INFO,

ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf

@@ -39,6 +39,7 @@
 
 [LibraryClasses]
   BaseLib
+  BaseMemoryLib
   DebugLib
   FdtLib
   ArmLib

ArmVirtPkg/PrePi/FdtParser.c

@@ -5,7 +5,8 @@
  */
 
 #include <Uefi.h>
-#include <Include/libfdt.h>
+#include <Library/BaseMemoryLib.h>
+#include <Library/FdtLib.h>
 
 BOOLEAN
 FindMemnode (
@@ -20,14 +21,14 @@ FindMemnode (
   INT32        Length;
   CONST INT32  *Prop;
 
-  if (fdt_check_header (DeviceTreeBlob) != 0) {
+  if (FdtCheckHeader (DeviceTreeBlob) != 0) {
     return FALSE;
   }
 
   //
   // Look for a node called "memory" at the lowest level of the tree
   //
-  MemoryNode = fdt_path_offset (DeviceTreeBlob, "/memory");
+  MemoryNode = FdtPathOffset (DeviceTreeBlob, "/memory");
   if (MemoryNode <= 0) {
     return FALSE;
   }
@@ -39,36 +40,36 @@ FindMemnode (
   AddressCells = 1;
   SizeCells    = 1;
 
-  Prop = fdt_getprop (DeviceTreeBlob, 0, "#address-cells", &Length);
+  Prop = FdtGetProp (DeviceTreeBlob, 0, "#address-cells", &Length);
   if (Length == 4) {
-    AddressCells = fdt32_to_cpu (*Prop);
+    AddressCells = Fdt32ToCpu (*Prop);
   }
 
-  Prop = fdt_getprop (DeviceTreeBlob, 0, "#size-cells", &Length);
+  Prop = FdtGetProp (DeviceTreeBlob, 0, "#size-cells", &Length);
   if (Length == 4) {
-    SizeCells = fdt32_to_cpu (*Prop);
+    SizeCells = Fdt32ToCpu (*Prop);
   }
 
   //
   // Now find the 'reg' property of the /memory node, and read the first
   // range listed.
   //
-  Prop = fdt_getprop (DeviceTreeBlob, MemoryNode, "reg", &Length);
+  Prop = FdtGetProp (DeviceTreeBlob, MemoryNode, "reg", &Length);
 
   if (Length < (AddressCells + SizeCells) * sizeof (INT32)) {
     return FALSE;
   }
 
-  *SystemMemoryBase = fdt32_to_cpu (Prop[0]);
+  *SystemMemoryBase = Fdt32ToCpu (Prop[0]);
   if (AddressCells > 1) {
-    *SystemMemoryBase = (*SystemMemoryBase << 32) | fdt32_to_cpu (Prop[1]);
+    *SystemMemoryBase = (*SystemMemoryBase << 32) | Fdt32ToCpu (Prop[1]);
   }
 
   Prop += AddressCells;
 
-  *SystemMemorySize = fdt32_to_cpu (Prop[0]);
+  *SystemMemorySize = Fdt32ToCpu (Prop[0]);
   if (SizeCells > 1) {
-    *SystemMemorySize = (*SystemMemorySize << 32) | fdt32_to_cpu (Prop[1]);
+    *SystemMemorySize = (*SystemMemorySize << 32) | Fdt32ToCpu (Prop[1]);
   }
 
   return TRUE;
@@ -80,6 +81,6 @@ CopyFdt (
   IN    VOID  *FdtSource
   )
 {
-  fdt_pack (FdtSource);
-  CopyMem (FdtDest, FdtSource, fdt_totalsize (FdtSource));
+  FdtPack (FdtSource);
+  CopyMem (FdtDest, FdtSource, FdtTotalSize (FdtSource));
 }

BaseTools/Conf/tools_def.template

@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2025, Intel Corporation. All rights reserved.<BR>
 #  Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
 #  Portions copyright (c) 2011 - 2019, ARM Ltd. All rights reserved.<BR>
 #  Copyright (c) 2015, Hewlett-Packard Development Company, L.P.<BR>
@@ -868,7 +868,7 @@ RELEASE_VS2022_ARM_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4
 NOOPT_VS2022_ARM_DLINK_FLAGS      = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:ARM /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG /WX /IGNORE:4210
 
 # BaseTools cannot handle XIP modules with different section and file alignment
-*_VS2022_ARM_DLINK_XIPFLAGS       = /ALIGN:32
+*_VS2022_ARM_DLINK_XIPFLAGS       = /ALIGN:64
 
 #####################
 # AARCH64 definitions
@@ -896,12 +896,12 @@ NOOPT_VS2022_AARCH64_ASM_FLAGS     = /nologo
 # Linker warning 4210 is disabled globally, because it checks if static initializers are present and the VCRuntime is
 # linked. We do not link the VCRuntime (except for HOST_APPLICATIONs) so this warning can be generated erroneously
 # whenever there are static initializers, because we will always fail the VCRuntime linking check
-  DEBUG_VS2022_AARCH64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:ARM64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /DRIVER /DEBUG /WX /IGNORE:4210
-RELEASE_VS2022_AARCH64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:ARM64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /DRIVER /MERGE:.rdata=.data /WX /IGNORE:4210
-NOOPT_VS2022_AARCH64_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:ARM64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /DRIVER /DEBUG /WX /IGNORE:4210
+  DEBUG_VS2022_AARCH64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4226 /OPT:REF /OPT:ICF=10 /MAP /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:ARM64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /DRIVER /DEBUG /WX /IGNORE:4210
+RELEASE_VS2022_AARCH64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4226 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:ARM64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /DRIVER /MERGE:.rdata=.data /WX /IGNORE:4210
+NOOPT_VS2022_AARCH64_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4226 /OPT:REF /OPT:ICF=10 /MAP /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:ARM64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /DRIVER /DEBUG /WX /IGNORE:4210
 
 # BaseTools cannot handle XIP modules with different section and file alignment
-*_VS2022_AARCH64_DLINK_XIPFLAGS    = /ALIGN:32
+*_VS2022_AARCH64_DLINK_XIPFLAGS    = /ALIGN:64
 
 ####################################################################################
 # GCC Common
@@ -943,7 +943,7 @@ DEFINE GCC_LOONGARCH64_ASLDLINK_FLAGS = DEF(GCC_LOONGARCH64_DLINK_FLAGS) -Wl,--e
 DEFINE GCC_IA32_X64_DLINK_FLAGS    = DEF(GCC_IA32_X64_DLINK_COMMON) --entry _$(IMAGE_ENTRY_POINT) --file-alignment 0x20 --section-alignment 0x20 -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
 DEFINE GCC_ASM_FLAGS               = -c -x assembler -imacros AutoGen.h
 DEFINE GCC_PP_FLAGS                = -E -x assembler-with-cpp -include AutoGen.h
-DEFINE GCC_VFRPP_FLAGS             = -x c -E -P -DVFRCOMPILE --include $(MODULE_NAME)StrDefs.h
+DEFINE GCC_VFRPP_FLAGS             = -x c -E -DVFRCOMPILE --include $(MODULE_NAME)StrDefs.h
 DEFINE GCC_ASLPP_FLAGS             = -x c -E -include AutoGen.h
 DEFINE GCC_ASLCC_FLAGS             = -x c
 DEFINE GCC_WINDRES_FLAGS           = -J rc -O coff